diff --git a/src/MSGraph.php b/src/MSGraph.php
index 499fa96..0a13c4d 100644
--- a/src/MSGraph.php
+++ b/src/MSGraph.php
@@ -1,157 +1,150 @@
 <?php
+
 namespace ProcessMaker\Flysystem\Adapter;
 
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Psr7\Stream;
 use League\Flysystem\Adapter\AbstractAdapter;
 use League\Flysystem\Config;
-use ProcessMaker\Flysystem\Adapter\MSGraph\AuthException;
-use ProcessMaker\Flysystem\Adapter\MSGraph\ModeException;
-use ProcessMaker\Flysystem\Adapter\MSGraph\SiteInvalidException;
-use League\OAuth2\Client\Provider\GenericProvider;
-use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use Microsoft\Graph\Graph;
 use Microsoft\Graph\Model;
+use ProcessMaker\Flysystem\Adapter\MSGraph\ModeException;
+use ProcessMaker\Flysystem\Adapter\MSGraph\SiteInvalidException;
 
-class MSGraph extends AbstractAdapter 
+class MSGraph extends AbstractAdapter
 {
     const MODE_SHAREPOINT = 'sharepoint';
+
     const MODE_ONEDRIVE = 'onedrive';
 
     // Our mode, if sharepoint or onedrive
     private $mode;
+
     // Our Microsoft Graph Client
     private $graph;
+
     // Our Microsoft Graph Access Token
     private $token;
+
     // Our targetId, sharepoint site if sharepoint, drive id if onedrive
     private $targetId;
+
     // Our driveId, which if non empty points to a Drive
     private $driveId;
+
     // Our url prefix to be used for most file operations. This gets created in our constructor
     private $prefix;
 
-    public function __construct($appId, $appPassword, $tokenEndpoint, $mode = self::MODE_ONEDRIVE, $targetId, $driveName = null)
+    public function __construct($mode)
     {
-        if($mode != self::MODE_ONEDRIVE && $mode != self::MODE_SHAREPOINT) {
+        if ($mode != self::MODE_ONEDRIVE && $mode != self::MODE_SHAREPOINT) {
             throw new ModeException("Unknown mode specified: " . $mode);
         }
-        $this->mode = $mode;
-
-        // Initialize the OAuth client
-        $oauthClient = new \League\OAuth2\Client\Provider\GenericProvider([
-            'clientId' => $appId,
-            'clientSecret' => $appPassword,
-            'urlAuthorize' => '',
-            'urlResourceOwnerDetails' => '',
-            'urlAccessToken' => $tokenEndpoint,
-        ]);
-
-        try {
-            $this->token = $oauthClient->getAccessToken('client_credentials', [
-                'scope' => 'https://graph.microsoft.com/.default'
-            ]);
-        } catch(IdentityProviderException $e) {
-            throw new AuthException($e->getMessage());
-        }
+    }
 
-        // Assign graph instance
-        $this->graph = new Graph();
-        $this->graph->setAccessToken($this->token->getToken());
+    public function initialize($graph, $mode = self::MODE_ONEDRIVE, $targetId, $driveName)
+    {
+        $this->mode = $mode;
+        $this->graph = $graph;
 
         // Check for existence
-        if($mode == self::MODE_SHAREPOINT) {
+        if ($mode == self::MODE_SHAREPOINT) {
             try {
-            $site = $this->graph->createRequest('GET', '/sites/' . $targetId)
-                ->setReturnType(Model\Site::class)
-                ->execute();
-            // Assign the site id triplet to our targetId
-            $this->targetId = $site->getId();
-            } catch(\Exception $e) {
-                if($e->getCode() == 400) {
+                $site = $this->graph->createRequest('GET', '/sites/' . $targetId)
+                    ->setReturnType(Model\Site::class)
+                    ->execute();
+                // Assign the site id triplet to our targetId
+                $this->targetId = $site->getId();
+            } catch (\Exception $e) {
+                if ($e->getCode() == 400) {
                     throw new SiteInvalidException("The sharepoint site " . $targetId . " is invalid.");
                 }
+
                 throw $e;
             }
             $this->prefix = "/sites/" . $this->targetId . '/drive/items/';
-            if($driveName != '') {
+            if ($driveName != '') {
                 // Then we specified a drive name, so let's enumerate the drives and find it
                 $drives = $this->graph->createRequest('GET', '/sites/' . $this->targetId . '/drives')
                     ->execute();
                 $drives = $drives->getBody()['value'];
-                foreach($drives as $drive) {
-                    if($drive['name'] == $driveName) {
+                foreach ($drives as $drive) {
+                    if ($drive['name'] == $driveName) {
                         $this->driveId = $drive['id'];
                         $this->prefix = "/drives/" . $this->driveId . "/items/";
+
                         break;
                     }
                 }
-                if(!$this->driveId) {
-                    throw new SiteInvalidException("The sharepoint drive with name " . $driveName  . " could not be found.");
+                if (! $this->driveId) {
+                    throw new SiteInvalidException("The sharepoint drive with name " . $driveName . " could not be found.");
                 }
-
             }
         }
-
     }
 
     public function has($path)
     {
-        if($this->mode == self::MODE_SHAREPOINT) {
+        if ($this->mode == self::MODE_SHAREPOINT) {
             try {
                 $driveItem = $this->graph->createRequest('GET', $this->prefix . 'root:/' . $path)
                     ->setReturnType(Model\DriveItem::class)
                     ->execute();
                 // Successfully retrieved meta data.
                 return true;
-            } catch(ClientException $e) {
-                if($e->getCode() == 404) {
+            } catch (ClientException $e) {
+                if ($e->getCode() == 404) {
                     // Not found, let's return false;
                     return false;
                 }
+
                 throw $e;
-            } catch(Exception $e) {
+            } catch (Exception $e) {
                 throw $e;
             }
         }
+
         return false;
     }
 
     public function read($path)
     {
-        if($this->mode == self::MODE_SHAREPOINT) {
+        if ($this->mode == self::MODE_SHAREPOINT) {
             try {
                 $driveItem = $this->graph->createRequest('GET', $this->prefix . 'root:/' . $path)
                     ->setReturnType(Model\DriveItem::class)
                     ->execute();
                 // Successfully retrieved meta data.
                 // Now get content
-                $contentStream = $this->graph->createRequest('GET', $this->prefix . $driveItem->getId() .'/content')
+                $contentStream = $this->graph->createRequest('GET', $this->prefix . $driveItem->getId() . '/content')
                     ->setReturnType(Stream::class)
                     ->execute();
                 $contents = '';
                 $bufferSize = 8012;
                 // Copy over the data into a string
-                while (!$contentStream->eof()) {
+                while (! $contentStream->eof()) {
                     $contents .= $contentStream->read($bufferSize);
                 }
+
                 return ['contents' => $contents];
-            } catch(ClientException $e) {
-                if($e->getCode() == 404) {
+            } catch (ClientException $e) {
+                if ($e->getCode() == 404) {
                     // Not found, let's return false;
                     return false;
                 }
+
                 throw $e;
-            } catch(Exception $e) {
+            } catch (Exception $e) {
                 throw $e;
             }
         }
+
         return false;
     }
 
     public function getUrl($path)
     {
-        if($this->mode == self::MODE_SHAREPOINT) {
+        if ($this->mode == self::MODE_SHAREPOINT) {
             try {
                 $driveItem = $this->graph->createRequest('GET', $this->prefix . 'root:/' . $path)
                     ->setReturnType(Model\DriveItem::class)
@@ -159,22 +152,23 @@ public function getUrl($path)
                 // Successfully retrieved meta data.
                 // Return url property
                 return $driveItem->getWebUrl();
-            } catch(ClientException $e) {
-                if($e->getCode() == 404) {
+            } catch (ClientException $e) {
+                if ($e->getCode() == 404) {
                     // Not found, let's return false;
                     return false;
                 }
+
                 throw $e;
-            } catch(Exception $e) {
+            } catch (Exception $e) {
                 throw $e;
             }
         }
+
         return false;
     }
-    
+
     public function readStream($path)
     {
-
     }
 
     public function listContents($directory = '', $recursive = false)
@@ -186,16 +180,17 @@ public function listContents($directory = '', $recursive = false)
                     ->execute();
                 // Successfully retrieved meta data.
                 // Now get content
-                $driveItems = $this->graph->createRequest('GET', $this->prefix . $drive->getId() .'/children')
+                $driveItems = $this->graph->createRequest('GET', $this->prefix . $drive->getId() . '/children')
                     ->setReturnType(Model\DriveItem::class)
                     ->execute();
-                
+
                 $children = [];
                 foreach ($driveItems as $driveItem) {
                     $item = $driveItem->getProperties();
                     $item['path'] = $directory . '/' . $driveItem->getName();
                     $children[] = $item;
                 }
+
                 return $children;
             } catch (ClientException $e) {
                 throw $e;
@@ -203,80 +198,71 @@ public function listContents($directory = '', $recursive = false)
                 throw $e;
             }
         }
+
         return [];
     }
 
     public function getMetadata($path)
     {
-
     }
 
     public function getSize($path)
     {
-
     }
 
     public function getMimetype($path)
     {
-
     }
 
     public function getTimestamp($path)
     {
-
     }
 
     public function getVisibility($path)
     {
-
     }
 
     // Write methods
     public function write($path, $contents, Config $config)
     {
-        if($this->mode == self::MODE_SHAREPOINT) {
+        if ($this->mode == self::MODE_SHAREPOINT) {
             // Attempt to write to sharepoint
-            try {
-                $driveItem = $this->graph->createRequest('PUT', $this->prefix . 'root:/' . $path . ':/content')
-                    ->attachBody($contents)
-                    ->setReturnType(Model\DriveItem::class)
-                    ->execute();
-                // Successfully created
-                return true;
-            } catch(Exception $e) {
-                throw $e;
-            }
+            $driveItem = $this->graph->createRequest('PUT', $this->prefix . 'root:/' . $path . ':/content')
+                ->attachBody($contents)
+                ->setReturnType(Model\DriveItem::class)
+                ->execute();
+
+            // Successfully created
+            return true;
         }
+
+        return false;
     }
 
     public function writeStream($path, $resource, Config $config)
     {
-
     }
 
     public function update($path, $contents, Config $config)
     {
-
+        return $this->write($path, $contents, $config);
     }
 
     public function updateStream($path, $resource, Config $config)
     {
-
     }
 
     public function rename($path, $newpath)
     {
-
     }
 
     public function copy($path, $newpath)
     {
-
     }
 
     public function delete($path)
     {
-        if($this->mode == self::MODE_SHAREPOINT) {
+        if ($this->mode == self::MODE_SHAREPOINT) {
             try {
                 $driveItem = $this->graph->createRequest('GET', $this->prefix . 'root:/' . $path)
                     ->setReturnType(Model\DriveItem::class)
@@ -285,34 +271,32 @@ public function delete($path)
                 // Now delete the file
                 $this->graph->createRequest('DELETE', $this->prefix . $driveItem->getId())
                     ->execute();
+
                 return true;
-            } catch(ClientException $e) {
-                if($e->getCode() == 404) {
+            } catch (ClientException $e) {
+                if ($e->getCode() == 404) {
                     // Not found, let's return false;
                     return false;
                 }
+
                 throw $e;
-            } catch(Exception $e) {
+            } catch (Exception $e) {
                 throw $e;
             }
         }
-        return false;
 
+        return false;
     }
 
     public function deleteDir($dirname)
     {
-
     }
 
     public function createDir($dirname, Config $config)
     {
-
     }
 
     public  function setVisibility($path, $visibility)
     {
-
     }
-
 }
diff --git a/src/MSGraphApp.php b/src/MSGraphApp.php
new file mode 100644
index 0000000..298c4f7
--- /dev/null
+++ b/src/MSGraphApp.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace ProcessMaker\Flysystem\Adapter;
+
+use Microsoft\Graph\Graph;
+
+class MSGraphApp extends MSGraph
+{
+    public function __construct($mode = self::MODE_ONEDRIVE, $targetId, $driveName = null, $appModeToken = null)
+    {
+        parent::__construct($mode);
+
+        // Assign graph instance
+        $graph = new Graph();
+        $graph->setAccessToken($appModeToken);
+
+        $this->initialize($graph, $mode, $targetId, $driveName);
+    }
+}
diff --git a/src/MSGraphUser.php b/src/MSGraphUser.php
new file mode 100644
index 0000000..789f40e
--- /dev/null
+++ b/src/MSGraphUser.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace ProcessMaker\Flysystem\Adapter;
+
+use Microsoft\Graph\Graph;
+use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
+
+class MSGraphUser extends MSGraph
+{
+
+    public function __construct($appId, $appPassword, $tokenEndpoint, $mode = self::MODE_ONEDRIVE, $targetId, $driveName = null)
+    {
+        parent::__construct($mode);
+
+        // Initialize the OAuth client
+        $oauthClient = new \League\OAuth2\Client\Provider\GenericProvider([
+            'clientId' => $appId,
+            'clientSecret' => $appPassword,
+            'urlAuthorize' => '',
+            'urlResourceOwnerDetails' => '',
+            'urlAccessToken' => $tokenEndpoint,
+        ]);
+
+        try {
+            $this->token = $oauthClient->getAccessToken('client_credentials', [
+                'scope' => 'https://graph.microsoft.com/.default'
+            ]);
+        } catch(IdentityProviderException $e) {
+            throw new AuthException($e->getMessage());
+        }
+
+        // Assign graph instance
+        $graph = new Graph();
+        $graph->setAccessToken($this->token->getToken());
+
+        $this->initialize($graph, $mode, $targetId, $driveName);
+    }
+}