diff --git a/examples/user-repositories-commits-async.php b/examples/user-repositories-commits-async.php
index 27dd3e4f8f..0742bae9f0 100644
--- a/examples/user-repositories-commits-async.php
+++ b/examples/user-repositories-commits-async.php
@@ -2,6 +2,7 @@
 use ApiClients\Client\Github\AsyncClient;
 use ApiClients\Client\Github\Resource\Async\Repository;
 use ApiClients\Client\Github\Resource\Async\User;
+use ApiClients\Client\Github\Resource\Repository\Commit;
 use function ApiClients\Foundation\resource_pretty_print;
 use React\EventLoop\Factory;
 
@@ -17,8 +18,10 @@
     return $user->repository($argv[2] ?? 'github');
 })->then(function (Repository $repository) {
     resource_pretty_print($repository, 1, true);
-    $repository->commits()->subscribe(function ($commit) {
-        resource_pretty_print($commit, 2, true);
+    $repository->commits()->take(1)->subscribe(function (Repository\Commit $commit) {
+        $commit->refresh()->then(function (Commit $commit) {
+            resource_pretty_print($commit, 2, true);
+        });
     }, 'display_throwable');
 })->done(null, 'display_throwable');
 
diff --git a/src/Resource/Async/Repository/Commit/EmptyFile.php b/src/Resource/Async/Repository/Commit/EmptyFile.php
new file mode 100644
index 0000000000..90616b8418
--- /dev/null
+++ b/src/Resource/Async/Repository/Commit/EmptyFile.php
@@ -0,0 +1,9 @@
+<?php declare(strict_types=1);
+
+namespace ApiClients\Client\Github\Resource\Async\Repository\Commit;
+
+use ApiClients\Client\Github\Resource\Repository\Commit\EmptyFile as BaseEmptyFile;
+
+class EmptyFile extends BaseEmptyFile
+{
+}
diff --git a/src/Resource/Async/Repository/Commit/File.php b/src/Resource/Async/Repository/Commit/File.php
new file mode 100644
index 0000000000..1e95a4e015
--- /dev/null
+++ b/src/Resource/Async/Repository/Commit/File.php
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);
+
+namespace ApiClients\Client\Github\Resource\Async\Repository\Commit;
+
+use ApiClients\Client\Github\Resource\Repository\Commit\File as BaseFile;
+
+class File extends BaseFile
+{
+    public function refresh(): File
+    {
+        throw new \Exception('TODO: create refresh method!');
+    }
+}
diff --git a/src/Resource/Repository/Commit.php b/src/Resource/Repository/Commit.php
index 28d93d9c88..74503341ce 100644
--- a/src/Resource/Repository/Commit.php
+++ b/src/Resource/Repository/Commit.php
@@ -14,7 +14,8 @@
 
 /**
  * @Collection(
- *     parents="Tree"
+ *     parents="Tree",
+ *     files="Repository\Commit\File"
  * )
  * @Nested(
  *     commit="Git\Commit",
@@ -60,6 +61,11 @@ abstract class Commit extends AbstractResource implements CommitInterface
      */
     protected $parents;
 
+    /**
+     * @var Commit\File[]
+     */
+    protected $files;
+
     /**
      * @return string
      */
@@ -115,4 +121,12 @@ public function parents(): array
     {
         return $this->parents;
     }
+
+    /**
+     * @return Commit\File[]
+     */
+    public function files(): array
+    {
+        return $this->files;
+    }
 }
diff --git a/src/Resource/Repository/Commit/EmptyFile.php b/src/Resource/Repository/Commit/EmptyFile.php
new file mode 100644
index 0000000000..3b82246bc1
--- /dev/null
+++ b/src/Resource/Repository/Commit/EmptyFile.php
@@ -0,0 +1,72 @@
+<?php declare(strict_types=1);
+
+namespace ApiClients\Client\Github\Resource\Repository\Commit;
+
+use ApiClients\Foundation\Resource\EmptyResourceInterface;
+
+abstract class EmptyFile implements FileInterface, EmptyResourceInterface
+{
+    /**
+     * @return string
+     */
+    public function filename(): string
+    {
+        return null;
+    }
+
+    /**
+     * @return int
+     */
+    public function additions(): int
+    {
+        return null;
+    }
+
+    /**
+     * @return int
+     */
+    public function deletions(): int
+    {
+        return null;
+    }
+
+    /**
+     * @return int
+     */
+    public function changes(): int
+    {
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function status(): string
+    {
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function rawUrl(): string
+    {
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function blobUrl(): string
+    {
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function patch(): string
+    {
+        return null;
+    }
+}
diff --git a/src/Resource/Repository/Commit/File.php b/src/Resource/Repository/Commit/File.php
new file mode 100644
index 0000000000..d28c2c57d6
--- /dev/null
+++ b/src/Resource/Repository/Commit/File.php
@@ -0,0 +1,116 @@
+<?php declare(strict_types=1);
+
+namespace ApiClients\Client\Github\Resource\Repository\Commit;
+
+use ApiClients\Foundation\Hydrator\Annotation\EmptyResource;
+use ApiClients\Foundation\Resource\AbstractResource;
+
+/**
+ * @EmptyResource("Repository\Commit\EmptyFile")
+ */
+abstract class File extends AbstractResource implements FileInterface
+{
+    /**
+     * @var string
+     */
+    protected $filename;
+
+    /**
+     * @var int
+     */
+    protected $additions;
+
+    /**
+     * @var int
+     */
+    protected $deletions;
+
+    /**
+     * @var int
+     */
+    protected $changes;
+
+    /**
+     * @var string
+     */
+    protected $status;
+
+    /**
+     * @var string
+     */
+    protected $raw_url;
+
+    /**
+     * @var string
+     */
+    protected $blob_url;
+
+    /**
+     * @var string
+     */
+    protected $patch;
+
+    /**
+     * @return string
+     */
+    public function filename(): string
+    {
+        return $this->filename;
+    }
+
+    /**
+     * @return int
+     */
+    public function additions(): int
+    {
+        return $this->additions;
+    }
+
+    /**
+     * @return int
+     */
+    public function deletions(): int
+    {
+        return $this->deletions;
+    }
+
+    /**
+     * @return int
+     */
+    public function changes(): int
+    {
+        return $this->changes;
+    }
+
+    /**
+     * @return string
+     */
+    public function status(): string
+    {
+        return $this->status;
+    }
+
+    /**
+     * @return string
+     */
+    public function rawUrl(): string
+    {
+        return $this->raw_url;
+    }
+
+    /**
+     * @return string
+     */
+    public function blobUrl(): string
+    {
+        return $this->blob_url;
+    }
+
+    /**
+     * @return string
+     */
+    public function patch(): string
+    {
+        return $this->patch;
+    }
+}
diff --git a/src/Resource/Repository/Commit/FileInterface.php b/src/Resource/Repository/Commit/FileInterface.php
new file mode 100644
index 0000000000..e22561f921
--- /dev/null
+++ b/src/Resource/Repository/Commit/FileInterface.php
@@ -0,0 +1,50 @@
+<?php declare(strict_types=1);
+
+namespace ApiClients\Client\Github\Resource\Repository\Commit;
+
+use ApiClients\Foundation\Resource\ResourceInterface;
+
+interface FileInterface extends ResourceInterface
+{
+    const HYDRATE_CLASS = 'Repository\\Commit\\File';
+
+    /**
+     * @return string
+     */
+    public function filename(): string;
+
+    /**
+     * @return int
+     */
+    public function additions(): int;
+
+    /**
+     * @return int
+     */
+    public function deletions(): int;
+
+    /**
+     * @return int
+     */
+    public function changes(): int;
+
+    /**
+     * @return string
+     */
+    public function status(): string;
+
+    /**
+     * @return string
+     */
+    public function rawUrl(): string;
+
+    /**
+     * @return string
+     */
+    public function blobUrl(): string;
+
+    /**
+     * @return string
+     */
+    public function patch(): string;
+}
diff --git a/src/Resource/Repository/EmptyCommit.php b/src/Resource/Repository/EmptyCommit.php
index d46ffee2b3..78ff181c9e 100644
--- a/src/Resource/Repository/EmptyCommit.php
+++ b/src/Resource/Repository/EmptyCommit.php
@@ -2,9 +2,6 @@
 
 namespace ApiClients\Client\Github\Resource\Repository;
 
-use ApiClients\Client\Github\Resource\Git\CommitInterface as GitCommitInterface;
-use ApiClients\Client\Github\Resource\TreeInterface;
-use ApiClients\Client\Github\Resource\UserInterface;
 use ApiClients\Foundation\Resource\EmptyResourceInterface;
 
 abstract class EmptyCommit implements CommitInterface, EmptyResourceInterface
@@ -34,33 +31,41 @@ public function htmlUrl(): string
     }
 
     /**
-     * @return GitCommitInterface
+     * @return Git\Commit
      */
-    public function commit(): GitCommitInterface
+    public function commit(): Git\Commit
     {
         return null;
     }
 
     /**
-     * @return UserInterface
+     * @return User
      */
-    public function author(): UserInterface
+    public function author(): User
     {
         return null;
     }
 
     /**
-     * @return UserInterface
+     * @return User
      */
-    public function comitter(): UserInterface
+    public function comitter(): User
     {
         return null;
     }
 
     /**
-     * @return TreeInterface
+     * @return Tree
      */
-    public function parents(): TreeInterface
+    public function parents(): Tree
+    {
+        return null;
+    }
+
+    /**
+     * @return Repository\Commit\File
+     */
+    public function files(): Repository\Commit\File
     {
         return null;
     }
diff --git a/src/Resource/Sync/Repository/Commit/EmptyFile.php b/src/Resource/Sync/Repository/Commit/EmptyFile.php
new file mode 100644
index 0000000000..d1dd232dba
--- /dev/null
+++ b/src/Resource/Sync/Repository/Commit/EmptyFile.php
@@ -0,0 +1,9 @@
+<?php declare(strict_types=1);
+
+namespace ApiClients\Client\Github\Resource\Sync\Repository\Commit;
+
+use ApiClients\Client\Github\Resource\Repository\Commit\EmptyFile as BaseEmptyFile;
+
+class EmptyFile extends BaseEmptyFile
+{
+}
diff --git a/src/Resource/Sync/Repository/Commit/File.php b/src/Resource/Sync/Repository/Commit/File.php
new file mode 100644
index 0000000000..d00e72f1f5
--- /dev/null
+++ b/src/Resource/Sync/Repository/Commit/File.php
@@ -0,0 +1,17 @@
+<?php declare(strict_types=1);
+
+namespace ApiClients\Client\Github\Resource\Sync\Repository\Commit;
+
+use ApiClients\Client\Github\Resource\Repository\Commit\File as BaseFile;
+use ApiClients\Client\Github\Resource\Repository\Commit\FileInterface;
+use ApiClients\Foundation\Hydrator\CommandBus\Command\BuildAsyncFromSyncCommand;
+
+class File extends BaseFile
+{
+    public function refresh(): File
+    {
+        return $this->wait($this->handleCommand(new BuildAsyncFromSyncCommand(self::HYDRATE_CLASS, $this))->then(function (FileInterface $file) {
+            return $file->refresh();
+        }));
+    }
+}
diff --git a/tests/Resource/Async/Repository/Commit/EmptyFileTest.php b/tests/Resource/Async/Repository/Commit/EmptyFileTest.php
new file mode 100644
index 0000000000..f5cb496a58
--- /dev/null
+++ b/tests/Resource/Async/Repository/Commit/EmptyFileTest.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace ApiClients\Tests\Client\Github\Resource\Async\Repository\Commit;
+
+use ApiClients\Client\Github\Resource\Async\Repository\Commit\EmptyFile;
+use ApiClients\Tools\ResourceTestUtilities\AbstractEmptyResourceTest;
+
+final class EmptyFileTest extends AbstractEmptyResourceTest
+{
+    public function getSyncAsync(): string
+    {
+        return 'Async';
+    }
+
+    public function getClass(): string
+    {
+        return EmptyFile::class;
+    }
+}
diff --git a/tests/Resource/Async/Repository/Commit/FileTest.php b/tests/Resource/Async/Repository/Commit/FileTest.php
new file mode 100644
index 0000000000..f2fd9a8b7b
--- /dev/null
+++ b/tests/Resource/Async/Repository/Commit/FileTest.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types=1);
+
+namespace ApiClients\Tests\Client\Github\Resource\Async\Repository\Commit;
+
+use ApiClients\Client\Github\ApiSettings;
+use ApiClients\Client\Github\Resource\Repository\Commit\File;
+use ApiClients\Tools\ResourceTestUtilities\AbstractResourceTest;
+
+class FileTest extends AbstractResourceTest
+{
+    public function getSyncAsync(): string
+    {
+        return 'Async';
+    }
+
+    public function getClass(): string
+    {
+        return File::class;
+    }
+
+    public function getNamespace(): string
+    {
+        return ApiSettings::NAMESPACE;
+    }
+}
diff --git a/tests/Resource/Sync/Repository/Commit/EmptyFileTest.php b/tests/Resource/Sync/Repository/Commit/EmptyFileTest.php
new file mode 100644
index 0000000000..6287f071ad
--- /dev/null
+++ b/tests/Resource/Sync/Repository/Commit/EmptyFileTest.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace ApiClients\Tests\Client\Github\Resource\Sync\Repository\Commit;
+
+use ApiClients\Client\Github\Resource\Sync\Repository\Commit\EmptyFile;
+use ApiClients\Tools\ResourceTestUtilities\AbstractEmptyResourceTest;
+
+final class EmptyFileTest extends AbstractEmptyResourceTest
+{
+    public function getSyncAsync(): string
+    {
+        return 'Sync';
+    }
+
+    public function getClass(): string
+    {
+        return EmptyFile::class;
+    }
+}
diff --git a/tests/Resource/Sync/Repository/Commit/FileTest.php b/tests/Resource/Sync/Repository/Commit/FileTest.php
new file mode 100644
index 0000000000..be9a3b903a
--- /dev/null
+++ b/tests/Resource/Sync/Repository/Commit/FileTest.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types=1);
+
+namespace ApiClients\Tests\Client\Github\Resource\Sync\Repository\Commit;
+
+use ApiClients\Client\Github\ApiSettings;
+use ApiClients\Client\Github\Resource\Repository\Commit\File;
+use ApiClients\Tools\ResourceTestUtilities\AbstractResourceTest;
+
+class FileTest extends AbstractResourceTest
+{
+    public function getSyncAsync(): string
+    {
+        return 'Sync';
+    }
+
+    public function getClass(): string
+    {
+        return File::class;
+    }
+
+    public function getNamespace(): string
+    {
+        return ApiSettings::NAMESPACE;
+    }
+}
diff --git a/yaml/repository-commit-file.yml b/yaml/repository-commit-file.yml
new file mode 100644
index 0000000000..cf8e9335bf
--- /dev/null
+++ b/yaml/repository-commit-file.yml
@@ -0,0 +1,10 @@
+class: Repository\Commit\File
+properties:
+  filename: string
+  additions: int
+  deletions: int
+  changes: int
+  status: string
+  raw_url: string
+  blob_url: string
+  patch: string
diff --git a/yaml/repository-commit.yml b/yaml/repository-commit.yml
index 0ec6006179..f44518b186 100644
--- a/yaml/repository-commit.yml
+++ b/yaml/repository-commit.yml
@@ -19,3 +19,7 @@ properties:
     type: Tree
     annotations:
       collection: Tree
+  files:
+    type: Repository\Commit\File
+    annotations:
+      collection: Repository\Commit\File