diff --git a/composer.json b/composer.json
index 9c54570..68b2f59 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,5 @@
 {
     "name": "microsoft/azure-storage-file",
-    "version": "1.2.5",
     "description": "This project provides a set of PHP client libraries that make it easy to access Microsoft Azure Storage File APIs.",
     "keywords": [ "php", "azure", "storage", "sdk", "file" ],
     "license": "MIT",
@@ -11,8 +10,8 @@
         }
     ],
     "require": {
-        "php": ">=5.6.0",
-		"microsoft/azure-storage-common": "~1.5"
+        "php": ">=7.1",
+		"microsoft/azure-storage-common": "^1.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/File/FileRestProxy.php b/src/File/FileRestProxy.php
index 1e00e36..7c7d1a0 100644
--- a/src/File/FileRestProxy.php
+++ b/src/File/FileRestProxy.php
@@ -184,8 +184,8 @@ private function createPath($share, $directory = '')
      */
     private function getSharePropertiesAsyncImpl(
         $share,
-        FileServiceOptions $options = null,
-        $operation = null
+        ?FileServiceOptions $options = null,
+        ?string $operation = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::isTrue(
@@ -256,8 +256,8 @@ private function getSharePropertiesAsyncImpl(
     private function setSharePropertiesAsyncImpl(
         $share,
         array $properties,
-        FileServiceOptions $options = null,
-        $operation = 'properties'
+        ?FileServiceOptions $options = null,
+        ?string $operation = 'properties'
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::isTrue(
@@ -336,7 +336,7 @@ private function multiplePutRangeConcurrentAsync(
         $path,
         $content,
         Range $range,
-        PutFileRangeOptions $options = null,
+        ?PutFileRangeOptions $options = null,
         $useTransactionalMD5 = false
     ) {
         $queryParams  = array();
@@ -447,7 +447,7 @@ private function multiplePutRangeConcurrentAsync(
      *
      * @see https://docs.microsoft.com/en-us/rest/api/storageservices/list-shares
      */
-    public function listShares(ListSharesOptions $options = null)
+    public function listShares(?ListSharesOptions $options = null)
     {
         return $this->listSharesAsync($options)->wait();
     }
@@ -461,7 +461,7 @@ public function listShares(ListSharesOptions $options = null)
      *
      * @see https://docs.microsoft.com/en-us/rest/api/storageservices/list-shares
      */
-    public function listSharesAsync(ListSharesOptions $options = null)
+    public function listSharesAsync(?ListSharesOptions $options = null)
     {
         $method      = Resources::HTTP_GET;
         $headers     = array();
@@ -538,7 +538,7 @@ public function listSharesAsync(ListSharesOptions $options = null)
      */
     public function createShare(
         $share,
-        CreateShareOptions $options = null
+        ?CreateShareOptions $options = null
     ) {
         $this->createShareAsync($share, $options)->wait();
     }
@@ -555,7 +555,7 @@ public function createShare(
      */
     public function createShareAsync(
         $share,
-        CreateShareOptions $options = null
+        ?CreateShareOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::notNullOrEmpty($share, 'share');
@@ -607,7 +607,7 @@ public function createShareAsync(
      */
     public function deleteShare(
         $share,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         $this->deleteShareAsync($share, $options)->wait();
     }
@@ -624,7 +624,7 @@ public function deleteShare(
      */
     public function deleteShareAsync(
         $share,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::notNullOrEmpty($share, 'share');
@@ -675,7 +675,7 @@ public function deleteShareAsync(
      */
     public function getShareProperties(
         $share,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         return $this->getSharePropertiesAsync($share, $options)->wait();
     }
@@ -692,7 +692,7 @@ public function getShareProperties(
      */
     public function getSharePropertiesAsync(
         $share,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         return $this->getSharePropertiesAsyncImpl($share, $options, 'properties');
     }
@@ -711,7 +711,7 @@ public function getSharePropertiesAsync(
     public function setShareProperties(
         $share,
         $quota,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         $this->setSharePropertiesAsync($share, $quota, $options)->wait();
     }
@@ -730,7 +730,7 @@ public function setShareProperties(
     public function setSharePropertiesAsync(
         $share,
         $quota,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         return $this->setSharePropertiesAsyncImpl(
             $share,
@@ -752,7 +752,7 @@ public function setSharePropertiesAsync(
      */
     public function getShareMetadata(
         $share,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         return $this->getShareMetadataAsync($share, $options)->wait();
     }
@@ -770,7 +770,7 @@ public function getShareMetadata(
      */
     public function getShareMetadataAsync(
         $share,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         return $this->getSharePropertiesAsyncImpl($share, $options, 'metadata');
     }
@@ -789,7 +789,7 @@ public function getShareMetadataAsync(
     public function setShareMetadata(
         $share,
         array $metadata,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         $this->setShareMetadataAsync($share, $metadata, $options)->wait();
     }
@@ -808,7 +808,7 @@ public function setShareMetadata(
     public function setShareMetadataAsync(
         $share,
         array $metadata,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         return $this->setSharePropertiesAsyncImpl(
             $share,
@@ -830,7 +830,7 @@ public function setShareMetadataAsync(
      */
     public function getShareAcl(
         $share,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         return $this->getShareAclAsync($share, $options)->wait();
     }
@@ -847,7 +847,7 @@ public function getShareAcl(
      */
     public function getShareAclAsync(
         $share,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
 
@@ -923,7 +923,7 @@ public function getShareAclAsync(
     public function setShareAcl(
         $share,
         ShareACL $acl,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         $this->setShareAclAsync($share, $acl, $options)->wait();
     }
@@ -943,7 +943,7 @@ public function setShareAcl(
     public function setShareAclAsync(
         $share,
         ShareACL $acl,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::notNullOrEmpty($acl, 'acl');
@@ -1002,7 +1002,7 @@ public function setShareAclAsync(
      *
      * @see https://docs.microsoft.com/en-us/rest/api/storageservices/get-share-stats
      */
-    public function getShareStats($share, FileServiceOptions $options = null)
+    public function getShareStats($share, ?FileServiceOptions $options = null)
     {
         return $this->getShareStatsAsync($share, $options)->wait();
     }
@@ -1017,7 +1017,7 @@ public function getShareStats($share, FileServiceOptions $options = null)
      *
      * @see https://docs.microsoft.com/en-us/rest/api/storageservices/get-share-stats
      */
-    public function getShareStatsAsync($share, FileServiceOptions $options = null)
+    public function getShareStatsAsync($share, ?FileServiceOptions $options = null)
     {
         Validate::canCastAsString($share, 'share');
 
@@ -1082,7 +1082,7 @@ public function getShareStatsAsync($share, FileServiceOptions $options = null)
     public function listDirectoriesAndFiles(
         $share,
         $path = '',
-        ListDirectoriesAndFilesOptions $options = null
+        ?ListDirectoriesAndFilesOptions $options = null
     ) {
         return $this->listDirectoriesAndFilesAsync($share, $path, $options)->wait();
     }
@@ -1103,7 +1103,7 @@ public function listDirectoriesAndFiles(
     public function listDirectoriesAndFilesAsync(
         $share,
         $path = '',
-        ListDirectoriesAndFilesOptions $options = null
+        ?ListDirectoriesAndFilesOptions $options = null
     ) {
         Validate::notNull($share, 'share');
         Validate::canCastAsString($share, 'share');
@@ -1185,7 +1185,7 @@ public function listDirectoriesAndFilesAsync(
     public function createDirectory(
         $share,
         $path,
-        CreateDirectoryOptions $options = null
+        ?CreateDirectoryOptions $options = null
     ) {
         $this->createDirectoryAsync($share, $path, $options)->wait();
     }
@@ -1204,7 +1204,7 @@ public function createDirectory(
     public function createDirectoryAsync(
         $share,
         $path,
-        CreateDirectoryOptions $options = null
+        ?CreateDirectoryOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -1254,7 +1254,7 @@ public function createDirectoryAsync(
     public function deleteDirectory(
         $share,
         $path,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         $this->deleteDirectoryAsync($share, $path, $options)->wait();
     }
@@ -1273,7 +1273,7 @@ public function deleteDirectory(
     public function deleteDirectoryAsync(
         $share,
         $path,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -1320,7 +1320,7 @@ public function deleteDirectoryAsync(
     public function getDirectoryProperties(
         $share,
         $path,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         return $this->getDirectoryPropertiesAsync($share, $path, $options)->wait();
     }
@@ -1340,7 +1340,7 @@ public function getDirectoryProperties(
     public function getDirectoryPropertiesAsync(
         $share,
         $path,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -1390,7 +1390,7 @@ public function getDirectoryPropertiesAsync(
     public function getDirectoryMetadata(
         $share,
         $path,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         return $this->getDirectoryMetadataAsync($share, $path, $options)->wait();
     }
@@ -1410,7 +1410,7 @@ public function getDirectoryMetadata(
     public function getDirectoryMetadataAsync(
         $share,
         $path,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -1468,7 +1468,7 @@ public function setDirectoryMetadata(
         $share,
         $path,
         array $metadata,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         $this->setDirectoryMetadataAsync(
             $share,
@@ -1495,7 +1495,7 @@ public function setDirectoryMetadataAsync(
         $share,
         $path,
         array $metadata,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -1551,7 +1551,7 @@ public function createFile(
         $share,
         $path,
         $size,
-        CreateFileOptions $options = null
+        ?CreateFileOptions $options = null
     ) {
         return $this->createFileAsync(
             $share,
@@ -1577,7 +1577,7 @@ public function createFileAsync(
         $share,
         $path,
         $size,
-        CreateFileOptions $options = null
+        ?CreateFileOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::notNullOrEmpty($share, 'share');
@@ -1683,7 +1683,7 @@ public function createFileAsync(
     public function deleteFile(
         $share,
         $path,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         $this->deleteFileAsync($share, $path, $options)->wait();
     }
@@ -1702,7 +1702,7 @@ public function deleteFile(
     public function deleteFileAsync(
         $share,
         $path,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -1750,7 +1750,7 @@ public function deleteFileAsync(
     public function getFile(
         $share,
         $path,
-        GetFileOptions $options = null
+        ?GetFileOptions $options = null
     ) {
         return $this->getFileAsync($share, $path, $options)->wait();
     }
@@ -1770,7 +1770,7 @@ public function getFile(
     public function getFileAsync(
         $share,
         $path,
-        GetFileOptions $options = null
+        ?GetFileOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -1840,7 +1840,7 @@ public function getFileAsync(
     public function getFileProperties(
         $share,
         $path,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         return $this->getFilePropertiesAsync($share, $path, $options)->wait();
     }
@@ -1860,7 +1860,7 @@ public function getFileProperties(
     public function getFilePropertiesAsync(
         $share,
         $path,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -1912,7 +1912,7 @@ public function setFileProperties(
         $share,
         $path,
         FileProperties $properties,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         $this->setFilePropertiesAsync($share, $path, $properties, $options)->wait();
     }
@@ -1933,7 +1933,7 @@ public function setFilePropertiesAsync(
         $share,
         $path,
         FileProperties $properties,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -2023,7 +2023,7 @@ public function setFilePropertiesAsync(
     public function getFileMetadata(
         $share,
         $path,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         return $this->getFileMetadataAsync($share, $path, $options)->wait();
     }
@@ -2043,7 +2043,7 @@ public function getFileMetadata(
     public function getFileMetadataAsync(
         $share,
         $path,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -2101,7 +2101,7 @@ public function setFileMetadata(
         $share,
         $path,
         array $metadata,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         return $this->setFileMetadataAsync(
             $share,
@@ -2128,7 +2128,7 @@ public function setFileMetadataAsync(
         $share,
         $path,
         array $metadata,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -2187,7 +2187,7 @@ public function putFileRange(
         $path,
         $content,
         Range $range,
-        PutFileRangeOptions $options = null
+        ?PutFileRangeOptions $options = null
     ) {
         $this->putFileRangeAsync(
             $share,
@@ -2219,7 +2219,7 @@ public function putFileRangeAsync(
         $path,
         $content,
         Range $range,
-        PutFileRangeOptions $options = null
+        ?PutFileRangeOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -2301,7 +2301,7 @@ public function createFileFromContent(
         $share,
         $path,
         $content,
-        CreateFileFromContentOptions $options = null
+        ?CreateFileFromContentOptions $options = null
     ) {
         $this->createFileFromContentAsync($share, $path, $content, $options)->wait();
     }
@@ -2321,7 +2321,7 @@ public function createFileFromContentAsync(
         $share,
         $path,
         $content,
-        CreateFileFromContentOptions $options = null
+        ?CreateFileFromContentOptions $options = null
     ) {
         $stream = Psr7\Utils::streamFor($content);
         $size = $stream->getSize();
@@ -2395,8 +2395,8 @@ public function createFileFromContentAsync(
     public function clearFileRange(
         $share,
         $path,
-        Range $range,
-        FileServiceOptions $options = null
+        ?Range $range,
+        ?FileServiceOptions $options = null
     ) {
         $this->clearFileRangeAsync($share, $path, $range, $options)->wait();
     }
@@ -2421,8 +2421,8 @@ public function clearFileRange(
     public function clearFileRangeAsync(
         $share,
         $path,
-        Range $range,
-        FileServiceOptions $options = null
+        ?Range $range,
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -2491,8 +2491,8 @@ public function clearFileRangeAsync(
     public function listFileRange(
         $share,
         $path,
-        Range $range = null,
-        FileServiceOptions $options = null
+        ?Range $range = null,
+        ?FileServiceOptions $options = null
     ) {
         return $this->listFileRangeAsync($share, $path, $range, $options)->wait();
     }
@@ -2514,8 +2514,8 @@ public function listFileRange(
     public function listFileRangeAsync(
         $share,
         $path,
-        Range $range = null,
-        FileServiceOptions $options = null
+        ?Range $range = null,
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -2600,7 +2600,7 @@ public function copyFile(
         $path,
         $sourcePath,
         array $metadata = array(),
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         return $this->copyFileAsync(
             $share,
@@ -2643,7 +2643,7 @@ public function copyFileAsync(
         $path,
         $sourcePath,
         array $metadata = array(),
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
@@ -2707,7 +2707,7 @@ public function abortCopy(
         $share,
         $path,
         $copyID,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         return $this->abortCopyAsync(
             $share,
@@ -2733,7 +2733,7 @@ public function abortCopyAsync(
         $share,
         $path,
         $copyID,
-        FileServiceOptions $options = null
+        ?FileServiceOptions $options = null
     ) {
         Validate::canCastAsString($share, 'share');
         Validate::canCastAsString($path, 'path');
diff --git a/src/File/Internal/IFile.php b/src/File/Internal/IFile.php
index 3e88ca8..ca77a1a 100644
--- a/src/File/Internal/IFile.php
+++ b/src/File/Internal/IFile.php
@@ -52,7 +52,7 @@ interface IFile
     *
     * @see https://docs.microsoft.com/en-us/rest/api/storageservices/get-file-service-properties
     */
-    public function getServiceProperties(ServiceOptions $options = null);
+    public function getServiceProperties(?ServiceOptions $options = null);
 
     /**
      * Creates promise to get the properties of the service.
@@ -63,7 +63,7 @@ public function getServiceProperties(ServiceOptions $options = null);
      *
      * @see https://docs.microsoft.com/en-us/rest/api/storageservices/get-file-service-properties
      */
-    public function getServicePropertiesAsync(ServiceOptions $options = null);
+    public function getServicePropertiesAsync(?ServiceOptions $options = null);
 
     /**
     * Sets the properties of the service.
@@ -77,7 +77,7 @@ public function getServicePropertiesAsync(ServiceOptions $options = null);
     */
     public function setServiceProperties(
         ServiceProperties $serviceProperties,
-        ServiceOptions    $options = null
+        ?ServiceOptions    $options = null
     );
 
     /**
@@ -95,7 +95,7 @@ public function setServiceProperties(
      */
     public function setServicePropertiesAsync(
         ServiceProperties $serviceProperties,
-        ServiceOptions    $options = null
+        ?ServiceOptions    $options = null
     );
 
     /**
@@ -107,7 +107,7 @@ public function setServicePropertiesAsync(
      *
      * @see https://docs.microsoft.com/en-us/rest/api/storageservices/list-shares
      */
-    public function listShares(FileModels\ListSharesOptions $options = null);
+    public function listShares(?FileModels\ListSharesOptions $options = null);
 
     /**
      * Create a promise to return a list of the shares under the specified account
@@ -118,7 +118,7 @@ public function listShares(FileModels\ListSharesOptions $options = null);
      *
      * @see https://docs.microsoft.com/en-us/rest/api/storageservices/list-shares
      */
-    public function listSharesAsync(FileModels\ListSharesOptions $options = null);
+    public function listSharesAsync(?FileModels\ListSharesOptions $options = null);
 
     /**
      * Creates a new share in the given storage account.
@@ -132,7 +132,7 @@ public function listSharesAsync(FileModels\ListSharesOptions $options = null);
      */
     public function createShare(
         $share,
-        FileModels\CreateShareOptions $options = null
+        ?FileModels\CreateShareOptions $options = null
     );
 
     /**
@@ -147,7 +147,7 @@ public function createShare(
      */
     public function createShareAsync(
         $share,
-        FileModels\CreateShareOptions $options = null
+        ?FileModels\CreateShareOptions $options = null
     );
 
     /**
@@ -162,7 +162,7 @@ public function createShareAsync(
      */
     public function deleteShare(
         $share,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -177,7 +177,7 @@ public function deleteShare(
      */
     public function deleteShareAsync(
         $share,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -192,7 +192,7 @@ public function deleteShareAsync(
      */
     public function getShareProperties(
         $share,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -207,7 +207,7 @@ public function getShareProperties(
      */
     public function getSharePropertiesAsync(
         $share,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -224,7 +224,7 @@ public function getSharePropertiesAsync(
     public function setShareProperties(
         $share,
         $quota,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -241,7 +241,7 @@ public function setShareProperties(
     public function setSharePropertiesAsync(
         $share,
         $quota,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -256,7 +256,7 @@ public function setSharePropertiesAsync(
      */
     public function getShareMetadata(
         $share,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -272,7 +272,7 @@ public function getShareMetadata(
     */
     public function getShareMetadataAsync(
         $share,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -289,7 +289,7 @@ public function getShareMetadataAsync(
     public function setShareMetadata(
         $share,
         array $metadata,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -306,7 +306,7 @@ public function setShareMetadata(
     public function setShareMetadataAsync(
         $share,
         array $metadata,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -321,7 +321,7 @@ public function setShareMetadataAsync(
      */
     public function getShareAcl(
         $share,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -336,7 +336,7 @@ public function getShareAcl(
      */
     public function getShareAclAsync(
         $share,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -354,7 +354,7 @@ public function getShareAclAsync(
     public function setShareAcl(
         $share,
         FileModels\ShareACL $acl,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -373,7 +373,7 @@ public function setShareAcl(
     public function setShareAclAsync(
         $share,
         FileModels\ShareACL $acl,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -388,7 +388,7 @@ public function setShareAclAsync(
      */
     public function getShareStats(
         $share,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -403,7 +403,7 @@ public function getShareStats(
      */
     public function getShareStatsAsync(
         $share,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -422,7 +422,7 @@ public function getShareStatsAsync(
     public function listDirectoriesAndFiles(
         $share,
         $path = '',
-        FileModels\ListDirectoriesAndFilesOptions $options = null
+        ?FileModels\ListDirectoriesAndFilesOptions $options = null
     );
 
     /**
@@ -441,7 +441,7 @@ public function listDirectoriesAndFiles(
     public function listDirectoriesAndFilesAsync(
         $share,
         $path = '',
-        FileModels\ListDirectoriesAndFilesOptions $options = null
+        ?FileModels\ListDirectoriesAndFilesOptions $options = null
     );
 
     /**
@@ -459,7 +459,7 @@ public function listDirectoriesAndFilesAsync(
     public function createDirectory(
         $share,
         $path,
-        FileModels\CreateDirectoryOptions $options = null
+        ?FileModels\CreateDirectoryOptions $options = null
     );
 
     /**
@@ -477,7 +477,7 @@ public function createDirectory(
     public function createDirectoryAsync(
         $share,
         $path,
-        FileModels\CreateDirectoryOptions $options = null
+        ?FileModels\CreateDirectoryOptions $options = null
     );
 
     /**
@@ -495,7 +495,7 @@ public function createDirectoryAsync(
     public function deleteDirectory(
         $share,
         $path,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -513,7 +513,7 @@ public function deleteDirectory(
     public function deleteDirectoryAsync(
         $share,
         $path,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -530,7 +530,7 @@ public function deleteDirectoryAsync(
     public function getDirectoryProperties(
         $share,
         $path,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -548,7 +548,7 @@ public function getDirectoryProperties(
     public function getDirectoryPropertiesAsync(
         $share,
         $path,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -565,7 +565,7 @@ public function getDirectoryPropertiesAsync(
     public function getDirectoryMetadata(
         $share,
         $path,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -583,7 +583,7 @@ public function getDirectoryMetadata(
     public function getDirectoryMetadataAsync(
         $share,
         $path,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -603,7 +603,7 @@ public function setDirectoryMetadata(
         $share,
         $path,
         array $metadata,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -624,7 +624,7 @@ public function setDirectoryMetadataAsync(
         $share,
         $path,
         array $metadata,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -643,7 +643,7 @@ public function createFile(
         $share,
         $path,
         $size,
-        FileModels\CreateFileOptions $options = null
+        ?FileModels\CreateFileOptions $options = null
     );
 
     /**
@@ -662,7 +662,7 @@ public function createFileAsync(
         $share,
         $path,
         $size,
-        FileModels\CreateFileOptions $options = null
+        ?FileModels\CreateFileOptions $options = null
     );
 
     /**
@@ -679,7 +679,7 @@ public function createFileAsync(
     public function deleteFile(
         $share,
         $path,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -696,7 +696,7 @@ public function deleteFile(
     public function deleteFileAsync(
         $share,
         $path,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -714,7 +714,7 @@ public function deleteFileAsync(
     public function getFile(
         $share,
         $path,
-        FileModels\GetFileOptions $options = null
+        ?FileModels\GetFileOptions $options = null
     );
 
     /**
@@ -732,7 +732,7 @@ public function getFile(
     public function getFileAsync(
         $share,
         $path,
-        FileModels\GetFileOptions $options = null
+        ?FileModels\GetFileOptions $options = null
     );
 
     /**
@@ -749,7 +749,7 @@ public function getFileAsync(
     public function getFileProperties(
         $share,
         $path,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -767,7 +767,7 @@ public function getFileProperties(
     public function getFilePropertiesAsync(
         $share,
         $path,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -786,7 +786,7 @@ public function setFileProperties(
         $share,
         $path,
         FileModels\FileProperties $properties,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -805,7 +805,7 @@ public function setFilePropertiesAsync(
         $share,
         $path,
         FileModels\FileProperties $properties,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -822,7 +822,7 @@ public function setFilePropertiesAsync(
     public function getFileMetadata(
         $share,
         $path,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -840,7 +840,7 @@ public function getFileMetadata(
     public function getFileMetadataAsync(
         $share,
         $path,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -859,7 +859,7 @@ public function setFileMetadata(
         $share,
         $path,
         array $metadata,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -879,7 +879,7 @@ public function setFileMetadataAsync(
         $share,
         $path,
         array $metadata,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -901,7 +901,7 @@ public function putFileRange(
         $path,
         $content,
         Range $range,
-        FileModels\PutFileRangeOptions $options = null
+        ?FileModels\PutFileRangeOptions $options = null
     );
 
     /**
@@ -925,7 +925,7 @@ public function putFileRangeAsync(
         $path,
         $content,
         Range $range,
-        FileModels\PutFileRangeOptions $options = null
+        ?FileModels\PutFileRangeOptions $options = null
     );
 
     /**
@@ -944,7 +944,7 @@ public function createFileFromContent(
         $share,
         $path,
         $content,
-        FileModels\CreateFileFromContentOptions $options = null
+        ?FileModels\CreateFileFromContentOptions $options = null
     );
 
     /**
@@ -963,7 +963,7 @@ public function createFileFromContentAsync(
         $share,
         $path,
         $content,
-        FileModels\CreateFileFromContentOptions $options = null
+        ?FileModels\CreateFileFromContentOptions $options = null
     );
 
     /**
@@ -986,7 +986,7 @@ public function clearFileRange(
         $share,
         $path,
         Range $range,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -1010,7 +1010,7 @@ public function clearFileRangeAsync(
         $share,
         $path,
         Range $range,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -1029,8 +1029,8 @@ public function clearFileRangeAsync(
     public function listFileRange(
         $share,
         $path,
-        Range $range = null,
-        FileModels\FileServiceOptions $options = null
+        ?Range $range = null,
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -1050,8 +1050,8 @@ public function listFileRange(
     public function listFileRangeAsync(
         $share,
         $path,
-        Range $range = null,
-        FileModels\FileServiceOptions $options = null
+        ?Range $range = null,
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -1086,7 +1086,7 @@ public function copyFile(
         $path,
         $sourcePath,
         array $metadata = array(),
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -1123,7 +1123,7 @@ public function copyFileAsync(
         $path,
         $sourcePath,
         array $metadata = array(),
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -1142,7 +1142,7 @@ public function abortCopy(
         $share,
         $path,
         $copyID,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 
     /**
@@ -1161,6 +1161,6 @@ public function abortCopyAsync(
         $share,
         $path,
         $copyID,
-        FileModels\FileServiceOptions $options = null
+        ?FileModels\FileServiceOptions $options = null
     );
 }