diff --git a/scm-core/src/main/java/sonia/scm/repository/FileObject.java b/scm-core/src/main/java/sonia/scm/repository/FileObject.java
index acb7559094..8f1cf298de 100644
--- a/scm-core/src/main/java/sonia/scm/repository/FileObject.java
+++ b/scm-core/src/main/java/sonia/scm/repository/FileObject.java
@@ -46,8 +46,11 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
+import java.util.OptionalLong;
 
 import static java.util.Collections.unmodifiableCollection;
+import static java.util.Optional.ofNullable;
 
 /**
  * The FileObject represents a file or a directory in a repository.
@@ -90,7 +93,9 @@ public class FileObject implements LastModifiedAware, Serializable
            && Objects.equal(description, other.description)
            && Objects.equal(length, other.length)
            && Objects.equal(subRepository, other.subRepository)
-           && Objects.equal(lastModified, other.lastModified);
+           && Objects.equal(commitDate, other.commitDate)
+           && Objects.equal(partialResult, other.partialResult)
+           && Objects.equal(computationAborted, other.computationAborted);
     //J+
   }
 
@@ -100,8 +105,16 @@ public class FileObject implements LastModifiedAware, Serializable
   @Override
   public int hashCode()
   {
-    return Objects.hashCode(name, path, directory, description, length,
-                            subRepository, lastModified);
+    return Objects.hashCode(
+      name,
+      path,
+      directory,
+      description,
+      length,
+      subRepository,
+      commitDate,
+      partialResult,
+      computationAborted);
   }
 
   /**
@@ -118,7 +131,9 @@ public class FileObject implements LastModifiedAware, Serializable
             .add("description", description)
             .add("length", length)
             .add("subRepository", subRepository)
-            .add("lastModified", lastModified)
+            .add("commitDate", commitDate)
+            .add("partialResult", partialResult)
+            .add("computationAborted", computationAborted)
             .toString();
     //J+
   }
@@ -130,35 +145,44 @@ public class FileObject implements LastModifiedAware, Serializable
    * if the repository provider is not able to get the last commit for the path.
    *
    *
-   * @return last commit message
+   * @return Last commit message or <code>null</code>, when this value has not been computed
+   * (see {@link #isPartialResult()}).
    */
-  public String getDescription()
+  public Optional<String> getDescription()
   {
-    return description;
+    return ofNullable(description);
   }
 
   /**
    * Returns the last commit date for this. The method will return null,
-   * if the repository provider is not able to get the last commit for the path.
+   * if the repository provider is not able to get the last commit for the path
+   * or it has not been computed.
    *
    *
    * @return last commit date
    */
   @Override
-  public Long getLastModified()
-  {
-    return lastModified;
+  public Long getLastModified() {
+    return this.isPartialResult()? null: this.commitDate;
   }
 
   /**
-   * Returns the length of the file.
-   *
-   *
-   * @return length of file
+   * Returns the last commit date for this. The method will return {@link OptionalLong#empty()},
+   * if the repository provider is not able to get the last commit for the path or if this value has not been computed
+   * (see {@link #isPartialResult()} and {@link #isComputationAborted()}).
    */
-  public long getLength()
+  public OptionalLong getCommitDate()
   {
-    return length;
+    return commitDate == null? OptionalLong.empty(): OptionalLong.of(commitDate);
+  }
+
+  /**
+   * Returns the length of the file or {@link OptionalLong#empty()}, when this value has not been computed
+   * (see {@link #isPartialResult()} and {@link #isComputationAborted()}).
+   */
+  public OptionalLong getLength()
+  {
+    return length == null? OptionalLong.empty(): OptionalLong.of(length);
   }
 
   /**
@@ -200,7 +224,7 @@ public class FileObject implements LastModifiedAware, Serializable
   }
 
   /**
-   * Return sub repository informations or null if the file is not 
+   * Return sub repository information or null if the file is not
    * sub repository.
    *
    * @since 1.10
@@ -222,10 +246,38 @@ public class FileObject implements LastModifiedAware, Serializable
     return directory;
   }
 
+  /**
+   * Returns the children of this file.
+   *
+   * @return The children of this file if it is a directory.
+   */
+  public Collection<FileObject> getChildren() {
+    return children == null? null: unmodifiableCollection(children);
+  }
+
+  /**
+   * If this is <code>true</code>, some values for this object have not been computed, yet. These values (like
+   * {@link #getLength()}, {@link #getDescription()} or {@link #getCommitDate()})
+   * will return {@link Optional#empty()} (or {@link OptionalLong#empty()} respectively), unless they are computed.
+   * There may be an asynchronous task running, that will set these values in the future.
+   *
+   * @since 2.0.0
+   *
+   * @return <code>true</code>, whenever some values of this object have not been computed, yet.
+   */
   public boolean isPartialResult() {
     return partialResult;
   }
 
+  /**
+   * If this is <code>true</code>, some values for this object have not been computed and will not be computed. These
+   * values (like {@link #getLength()}, {@link #getDescription()} or {@link #getCommitDate()})
+   * will return {@link Optional#empty()} (or {@link OptionalLong#empty()} respectively), unless they are computed.
+   *
+   * @since 2.0.0
+   *
+   * @return <code>true</code>, whenever some values of this object finally are not computed.
+   */
   public boolean isComputationAborted() {
     return computationAborted;
   }
@@ -255,14 +307,14 @@ public class FileObject implements LastModifiedAware, Serializable
   }
 
   /**
-   * Sets the last modified date of the file.
+   * Sets the commit date of the file.
    *
    *
-   * @param lastModified last modified date
+   * @param commitDate commit date
    */
-  public void setLastModified(Long lastModified)
+  public void setCommitDate(Long commitDate)
   {
-    this.lastModified = lastModified;
+    this.commitDate = commitDate;
   }
 
   /**
@@ -271,7 +323,7 @@ public class FileObject implements LastModifiedAware, Serializable
    *
    * @param length file length
    */
-  public void setLength(long length)
+  public void setLength(Long length)
   {
     this.length = length;
   }
@@ -310,30 +362,47 @@ public class FileObject implements LastModifiedAware, Serializable
     this.subRepository = subRepository;
   }
 
+  /**
+   * Set marker, that some values for this object are not computed, yet.
+   *
+   * @since 2.0.0
+   *
+   * @param partialResult Set this to <code>true</code>, whenever some values of this object are not computed, yet.
+   */
   public void setPartialResult(boolean partialResult) {
     this.partialResult = partialResult;
   }
 
+  /**
+   * Set marker, that computation of some values for this object has been aborted.
+   *
+   * @since 2.0.0
+   *
+   * @param computationAborted Set this to <code>true</code>, whenever some values of this object are not computed and
+   *                           will not be computed in the future.
+   */
   public void setComputationAborted(boolean computationAborted) {
     this.computationAborted = computationAborted;
   }
 
-  public Collection<FileObject> getChildren() {
-    return unmodifiableCollection(children);
-  }
-
+  /**
+   * Set the children for this file.
+   *
+   * @param children The new childre.
+   */
   public void setChildren(List<FileObject> children) {
     this.children = new ArrayList<>(children);
   }
 
+  /**
+   * Adds a child to the list of children .
+   *
+   * @param child The additional child.
+   */
   public void addChild(FileObject child) {
     this.children.add(child);
   }
 
-  public boolean hasChildren() {
-    return !children.isEmpty();
-  }
-
   //~--- fields ---------------------------------------------------------------
 
   /** file description */
@@ -342,11 +411,11 @@ public class FileObject implements LastModifiedAware, Serializable
   /** directory indicator */
   private boolean directory;
 
-  /** last modified date */
-  private Long lastModified;
+  /** commit date */
+  private Long commitDate;
 
   /** file length */
-  private long length;
+  private Long length;
 
   /** filename */
   private String name;
@@ -354,13 +423,16 @@ public class FileObject implements LastModifiedAware, Serializable
   /** file path */
   private String path;
 
+  /** Marker for partial result. */
   private boolean partialResult = false;
 
+  /** Marker for aborted computation. */
   private boolean computationAborted = false;
 
   /** sub repository informations */
   @XmlElement(name = "subrepository")
   private SubRepository subRepository;
 
+  /** Children of this file (aka directory). */
   private Collection<FileObject> children = new ArrayList<>();
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
index d13991558a..e8ef5a7a33 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
@@ -345,7 +345,7 @@ public class GitBrowseCommand extends AbstractGitCommand
     Blob blob = lfsBlobStore.get(oid);
     if (blob == null) {
       logger.error("lfs blob for lob id {} not found in lfs store of repository {}", oid, repository.getNamespaceAndName());
-      file.setLength(-1);
+      file.setLength(null);
     } else {
       file.setLength(blob.getSize());
     }
@@ -402,7 +402,7 @@ public class GitBrowseCommand extends AbstractGitCommand
     }
 
     private void applyValuesFromCommit(SyncAsyncExecutor.ExecutionType executionType, RevCommit commit) {
-      file.setLastModified(GitUtil.getCommitTime(commit));
+      file.setCommitDate(GitUtil.getCommitTime(commit));
       file.setDescription(commit.getShortMessage());
       if (executionType == ASYNCHRONOUS && browserResult != null) {
         updateCache(request);
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java
index 9b45cda16f..39066f0a9d 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java
@@ -108,9 +108,9 @@ public class GitBrowseCommandTest extends AbstractGitCommandTestBase {
     assertFalse(a.isDirectory());
     assertEquals("a.txt", a.getName());
     assertEquals("a.txt", a.getPath());
-    assertEquals("added new line for blame", a.getDescription());
-    assertTrue(a.getLength() > 0);
-    checkDate(a.getLastModified());
+    assertEquals("added new line for blame", a.getDescription().get());
+    assertTrue(a.getLength().getAsLong() > 0);
+    checkDate(a.getCommitDate().getAsLong());
 
     assertTrue(c.isDirectory());
     assertEquals("c", c.getName());
@@ -132,28 +132,28 @@ public class GitBrowseCommandTest extends AbstractGitCommandTestBase {
       FileObject b = findFile(foList, "b.txt");
 
       assertTrue(a.isPartialResult());
-      assertNull("expected empty name before commit could have been read", a.getDescription());
-      assertNull("expected empty date before commit could have been read", a.getLastModified());
+      assertFalse("expected empty name before commit could have been read", a.getDescription().isPresent());
+      assertFalse("expected empty date before commit could have been read", a.getCommitDate().isPresent());
       assertTrue(b.isPartialResult());
-      assertNull("expected empty name before commit could have been read", b.getDescription());
-      assertNull("expected empty date before commit could have been read", b.getLastModified());
+      assertFalse("expected empty name before commit could have been read", b.getDescription().isPresent());
+      assertFalse("expected empty date before commit could have been read", b.getCommitDate().isPresent());
 
       executor.next();
 
       assertEquals(1, updatedResults.size());
       assertFalse(a.isPartialResult());
       assertNotNull("expected correct name after commit could have been read", a.getDescription());
-      assertNotNull("expected correct date after commit could have been read", a.getLastModified());
+      assertTrue("expected correct date after commit could have been read", a.getCommitDate().isPresent());
       assertTrue(b.isPartialResult());
-      assertNull("expected empty name before commit could have been read", b.getDescription());
-      assertNull("expected empty date before commit could have been read", b.getLastModified());
+      assertFalse("expected empty name before commit could have been read", b.getDescription().isPresent());
+      assertFalse("expected empty date before commit could have been read", b.getCommitDate().isPresent());
 
       executor.next();
 
       assertEquals(2, updatedResults.size());
       assertFalse(b.isPartialResult());
       assertNotNull("expected correct name after commit could have been read", b.getDescription());
-      assertNotNull("expected correct date after commit could have been read", b.getLastModified());
+      assertTrue("expected correct date after commit could have been read", b.getCommitDate().isPresent());
     }
   }
 
@@ -175,16 +175,16 @@ public class GitBrowseCommandTest extends AbstractGitCommandTestBase {
     assertFalse(d.isDirectory());
     assertEquals("d.txt", d.getName());
     assertEquals("c/d.txt", d.getPath());
-    assertEquals("added file d and e in folder c", d.getDescription());
-    assertTrue(d.getLength() > 0);
-    checkDate(d.getLastModified());
+    assertEquals("added file d and e in folder c", d.getDescription().get());
+    assertTrue(d.getLength().getAsLong() > 0);
+    checkDate(d.getCommitDate().getAsLong());
 
     assertFalse(e.isDirectory());
     assertEquals("e.txt", e.getName());
     assertEquals("c/e.txt", e.getPath());
-    assertEquals("added file d and e in folder c", e.getDescription());
-    assertTrue(e.getLength() > 0);
-    checkDate(e.getLastModified());
+    assertEquals("added file d and e in folder c", e.getDescription().get());
+    assertTrue(e.getLength().getAsLong() > 0);
+    checkDate(e.getCommitDate().getAsLong());
   }
 
   @Test
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgFileviewCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgFileviewCommand.java
index 0897a191a1..4d5d5e8646 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgFileviewCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgFileviewCommand.java
@@ -231,13 +231,13 @@ public class HgFileviewCommand extends AbstractCommand
     file.setName(getNameFromPath(path));
     file.setPath(path);
     file.setDirectory(false);
-    file.setLength(stream.decimalIntUpTo(' '));
+    file.setLength((long) stream.decimalIntUpTo(' '));
 
     DateTime timestamp = stream.dateTimeUpTo(' ');
     String description = stream.textUpTo('\0');
 
     if (!disableLastCommit) {
-      file.setLastModified(timestamp.getDate().getTime());
+      file.setCommitDate(timestamp.getDate().getTime());
       file.setDescription(description);
     }
 
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgBrowseCommandTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgBrowseCommandTest.java
index 2116d06a7a..92a05a05a0 100644
--- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgBrowseCommandTest.java
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgBrowseCommandTest.java
@@ -61,7 +61,7 @@ public class HgBrowseCommandTest extends AbstractHgCommandTestBase {
     FileObject file = new HgBrowseCommand(cmdContext, repository).getBrowserResult(request).getFile();
     assertEquals("a.txt", file.getName());
     assertFalse(file.isDirectory());
-    assertTrue(file.getChildren().isEmpty());
+    assertTrue(file.getChildren() == null || file.getChildren().isEmpty());
   }
 
   @Test
@@ -73,9 +73,9 @@ public class HgBrowseCommandTest extends AbstractHgCommandTestBase {
     assertFalse(a.isDirectory());
     assertEquals("a.txt", a.getName());
     assertEquals("a.txt", a.getPath());
-    assertEquals("added new line for blame", a.getDescription());
-    assertTrue(a.getLength() > 0);
-    checkDate(a.getLastModified());
+    assertEquals("added new line for blame", a.getDescription().get());
+    assertTrue(a.getLength().getAsLong() > 0);
+    checkDate(a.getCommitDate().getAsLong());
     assertTrue(c.isDirectory());
     assertEquals("c", c.getName());
     assertEquals("c", c.getPath());
@@ -132,16 +132,16 @@ public class HgBrowseCommandTest extends AbstractHgCommandTestBase {
     assertFalse(d.isDirectory());
     assertEquals("d.txt", d.getName());
     assertEquals("c/d.txt", d.getPath());
-    assertEquals("added file d and e in folder c", d.getDescription());
-    assertTrue(d.getLength() > 0);
-    checkDate(d.getLastModified());
+    assertEquals("added file d and e in folder c", d.getDescription().get());
+    assertTrue(d.getLength().getAsLong() > 0);
+    checkDate(d.getCommitDate().getAsLong());
     assertNotNull(e);
     assertFalse(e.isDirectory());
     assertEquals("e.txt", e.getName());
     assertEquals("c/e.txt", e.getPath());
-    assertEquals("added file d and e in folder c", e.getDescription());
-    assertTrue(e.getLength() > 0);
-    checkDate(e.getLastModified());
+    assertEquals("added file d and e in folder c", e.getDescription().get());
+    assertTrue(e.getLength().getAsLong() > 0);
+    checkDate(e.getCommitDate().getAsLong());
   }
 
   @Test
@@ -154,8 +154,8 @@ public class HgBrowseCommandTest extends AbstractHgCommandTestBase {
 
     FileObject a = getFileObject(foList, "a.txt");
 
-    assertNull(a.getDescription());
-    assertNull(a.getLastModified());
+    assertFalse(a.getDescription().isPresent());
+    assertFalse(a.getCommitDate().isPresent());
   }
 
   @Test
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
index 99dae0e77b..e4a32c8ca6 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
@@ -173,7 +173,7 @@ public class SvnBrowseCommand extends AbstractSvnCommand
     {
       if (entry.getDate() != null)
       {
-        fileObject.setLastModified(entry.getDate().getTime());
+        fileObject.setCommitDate(entry.getDate().getTime());
       }
 
       fileObject.setDescription(entry.getCommitMessage());
diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnBrowseCommandTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnBrowseCommandTest.java
index d3e6a98558..980d486b5c 100644
--- a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnBrowseCommandTest.java
+++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnBrowseCommandTest.java
@@ -60,7 +60,7 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
     FileObject file = createCommand().getBrowserResult(request).getFile();
     assertEquals("a.txt", file.getName());
     assertFalse(file.isDirectory());
-    assertTrue(file.getChildren().isEmpty());
+    assertTrue(file.getChildren() == null || file.getChildren().isEmpty());
   }
 
   @Test
@@ -73,9 +73,9 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
     assertFalse(a.isDirectory());
     assertEquals("a.txt", a.getName());
     assertEquals("a.txt", a.getPath());
-    assertEquals("added line for blame test", a.getDescription());
-    assertTrue(a.getLength() > 0);
-    checkDate(a.getLastModified());
+    assertEquals("added line for blame test", a.getDescription().get());
+    assertTrue(a.getLength().getAsLong() > 0);
+    checkDate(a.getCommitDate().getAsLong());
     assertTrue(c.isDirectory());
     assertEquals("c", c.getName());
     assertEquals("c", c.getPath());
@@ -122,16 +122,16 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
     assertFalse(d.isDirectory());
     assertEquals("d.txt", d.getName());
     assertEquals("c/d.txt", d.getPath());
-    assertEquals("added d and e in folder c", d.getDescription());
-    assertTrue(d.getLength() > 0);
-    checkDate(d.getLastModified());
+    assertEquals("added d and e in folder c", d.getDescription().get());
+    assertTrue(d.getLength().getAsLong() > 0);
+    checkDate(d.getCommitDate().getAsLong());
     assertNotNull(e);
     assertFalse(e.isDirectory());
     assertEquals("e.txt", e.getName());
     assertEquals("c/e.txt", e.getPath());
-    assertEquals("added d and e in folder c", e.getDescription());
-    assertTrue(e.getLength() > 0);
-    checkDate(e.getLastModified());
+    assertEquals("added d and e in folder c", e.getDescription().get());
+    assertTrue(e.getLength().getAsLong() > 0);
+    checkDate(e.getCommitDate().getAsLong());
   }
 
   @Test
@@ -144,8 +144,8 @@ public class SvnBrowseCommandTest extends AbstractSvnCommandTestBase
 
     FileObject a = getFileObject(foList, "a.txt");
 
-    assertNull(a.getDescription());
-    assertNull(a.getLastModified());
+    assertFalse(a.getDescription().isPresent());
+    assertFalse(a.getCommitDate().isPresent());
   }
   
   @Test
diff --git a/scm-ui/ui-types/src/Sources.ts b/scm-ui/ui-types/src/Sources.ts
index f5fca71d65..dce6947622 100644
--- a/scm-ui/ui-types/src/Sources.ts
+++ b/scm-ui/ui-types/src/Sources.ts
@@ -13,8 +13,8 @@ export type File = {
   directory: boolean;
   description?: string;
   revision: string;
-  length: number;
-  lastModified?: string;
+  length?: number;
+  commitDate?: string;
   subRepository?: SubRepository; // TODO
   partialResult: boolean;
   computationAborted: boolean;
diff --git a/scm-ui/ui-webapp/src/repos/sources/components/FileTree.tsx b/scm-ui/ui-webapp/src/repos/sources/components/FileTree.tsx
index 9782b69e0d..c1384b5192 100644
--- a/scm-ui/ui-webapp/src/repos/sources/components/FileTree.tsx
+++ b/scm-ui/ui-webapp/src/repos/sources/components/FileTree.tsx
@@ -133,7 +133,7 @@ class FileTree extends React.Component<Props, State> {
               <FixedWidthTh />
               <th>{t("sources.file-tree.name")}</th>
               <th className="is-hidden-mobile">{t("sources.file-tree.length")}</th>
-              <th className="is-hidden-mobile">{t("sources.file-tree.lastModified")}</th>
+              <th className="is-hidden-mobile">{t("sources.file-tree.commitDate")}</th>
               <th className="is-hidden-touch">{t("sources.file-tree.description")}</th>
               {binder.hasExtension("repos.sources.tree.row.right") && <th className="is-hidden-mobile" />}
             </tr>
diff --git a/scm-ui/ui-webapp/src/repos/sources/components/FileTreeLeaf.tsx b/scm-ui/ui-webapp/src/repos/sources/components/FileTreeLeaf.tsx
index 8a84fc5e1e..cd6baea395 100644
--- a/scm-ui/ui-webapp/src/repos/sources/components/FileTreeLeaf.tsx
+++ b/scm-ui/ui-webapp/src/repos/sources/components/FileTreeLeaf.tsx
@@ -64,9 +64,11 @@ class FileTreeLeaf extends React.Component<Props> {
     return <Link to={this.createLink(file)}>{file.name}</Link>;
   };
 
-  contentIfPresent = (file: File, content: any) => {
+  contentIfPresent = (file: File, attribute: string, content: (file: File) => any) => {
     const { t } = this.props;
-    if (file.computationAborted) {
+    if (file.hasOwnProperty(attribute)) {
+      return content(file);
+    } else if (file.computationAborted) {
       return (
         <Tooltip location="top" message={t("sources.file-tree.computationAborted")}>
           <Icon name={"question-circle"} />
@@ -79,23 +81,24 @@ class FileTreeLeaf extends React.Component<Props> {
         </Tooltip>
       );
     } else {
-      return content;
+      return content(file);
     }
   };
 
   render() {
     const { file } = this.props;
 
-    const fileSize = file.directory ? "" : <FileSize bytes={file.length} />;
+    const renderFileSize = (file: File) => <FileSize bytes={file.length} />;
+    const renderCommitDate = (file: File) => <DateFromNow date={file.commitDate} />;
 
     return (
       <tr>
         <td>{this.createFileIcon(file)}</td>
         <MinWidthTd className="is-word-break">{this.createFileName(file)}</MinWidthTd>
-        <NoWrapTd className="is-hidden-mobile">{fileSize}</NoWrapTd>
-        <td className="is-hidden-mobile">{this.contentIfPresent(file, <DateFromNow date={file.lastModified} />)}</td>
+        <NoWrapTd className="is-hidden-mobile">{file.directory ? "" : this.contentIfPresent(file, "length", renderFileSize)}</NoWrapTd>
+        <td className="is-hidden-mobile">{this.contentIfPresent(file, "commitDate", renderCommitDate)}</td>
         <MinWidthTd className={classNames("is-word-break", "is-hidden-touch")}>
-          {this.contentIfPresent(file, file.description)}
+          {this.contentIfPresent(file, "description", file => file.description)}
         </MinWidthTd>
         {binder.hasExtension("repos.sources.tree.row.right") && (
           <td className="is-hidden-mobile">
diff --git a/scm-ui/ui-webapp/src/repos/sources/containers/Content.tsx b/scm-ui/ui-webapp/src/repos/sources/containers/Content.tsx
index adb56ecd97..34c07e0be1 100644
--- a/scm-ui/ui-webapp/src/repos/sources/containers/Content.tsx
+++ b/scm-ui/ui-webapp/src/repos/sources/containers/Content.tsx
@@ -115,7 +115,7 @@ class Content extends React.Component<Props, State> {
   showMoreInformation() {
     const collapsed = this.state.collapsed;
     const { file, revision, t, repository } = this.props;
-    const date = <DateFromNow date={file.lastModified} />;
+    const date = <DateFromNow date={file.commitDate} />;
     const description = file.description ? (
       <p>
         {file.description.split("\n").map((item, key) => {
diff --git a/scm-ui/ui-webapp/src/repos/sources/modules/sources.test.ts b/scm-ui/ui-webapp/src/repos/sources/modules/sources.test.ts
index fd676d7c57..2d05c5814e 100644
--- a/scm-ui/ui-webapp/src/repos/sources/modules/sources.test.ts
+++ b/scm-ui/ui-webapp/src/repos/sources/modules/sources.test.ts
@@ -49,10 +49,8 @@ const collection = {
         name: "src",
         path: "src",
         directory: true,
-        description: "",
         length: 176,
         revision: "76aae4bb4ceacf0e88938eb5b6832738b7d537b4",
-        lastModified: "",
         subRepository: undefined,
         _links: {
           self: {
@@ -71,7 +69,7 @@ const collection = {
         description: "bump version",
         length: 780,
         revision: "76aae4bb4ceacf0e88938eb5b6832738b7d537b4",
-        lastModified: "2017-07-31T11:17:19Z",
+        commitDate: "2017-07-31T11:17:19Z",
         subRepository: undefined,
         _links: {
           self: {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultToFileObjectDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultToFileObjectDtoMapper.java
index 866c2cc0b9..f9304881e7 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultToFileObjectDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BrowserResultToFileObjectDtoMapper.java
@@ -15,6 +15,9 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.time.Instant;
+import java.util.Optional;
+import java.util.OptionalLong;
 
 @Mapper
 public abstract class BrowserResultToFileObjectDtoMapper extends BaseFileObjectDtoMapper {
@@ -39,6 +42,14 @@ public abstract class BrowserResultToFileObjectDtoMapper extends BaseFileObjectD
     applyEnrichers(appender, fileObject, namespaceAndName, browserResult, browserResult.getRevision());
   }
 
+  Optional<Instant> mapOptionalInstant(OptionalLong optionalLong) {
+    if (optionalLong.isPresent()) {
+      return Optional.of(Instant.ofEpochMilli(optionalLong.getAsLong()));
+    } else {
+      return Optional.empty();
+    }
+  }
+
   @Qualifier
   @Target(ElementType.METHOD)
   @Retention(RetentionPolicy.CLASS)
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectDto.java
index 4676a0fb03..b273f241dc 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectDto.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectDto.java
@@ -10,6 +10,8 @@ import lombok.Setter;
 
 import java.time.Instant;
 import java.util.List;
+import java.util.Optional;
+import java.util.OptionalLong;
 
 @Getter
 @Setter
@@ -19,10 +21,10 @@ public class FileObjectDto extends HalRepresentation {
   private String path;
   private boolean directory;
   @JsonInclude(JsonInclude.Include.NON_EMPTY)
-  private String description;
-  private long length;
+  private Optional<String> description;
+  private OptionalLong length;
   @JsonInclude(JsonInclude.Include.NON_EMPTY)
-  private Instant lastModified;
+  private Optional<Instant> commitDate;
   @JsonInclude(JsonInclude.Include.NON_EMPTY)
   private SubRepositoryDto subRepository;
   @JsonInclude(JsonInclude.Include.NON_EMPTY)
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BrowserResultToFileObjectDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BrowserResultToFileObjectDtoMapperTest.java
index 27ef82834b..273cc25018 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BrowserResultToFileObjectDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BrowserResultToFileObjectDtoMapperTest.java
@@ -30,6 +30,7 @@ public class BrowserResultToFileObjectDtoMapperTest {
 
   private FileObject fileObject1 = new FileObject();
   private FileObject fileObject2 = new FileObject();
+  private FileObject partialFileObject = new FileObject();
 
 
   @Before
@@ -42,15 +43,15 @@ public class BrowserResultToFileObjectDtoMapperTest {
     ThreadContext.bind(subject);
 
     fileObject1.setName("FO 1");
-    fileObject1.setLength(100);
-    fileObject1.setLastModified(0L);
+    fileObject1.setLength(100L);
+    fileObject1.setCommitDate(0L);
     fileObject1.setPath("/path/object/1");
     fileObject1.setDescription("description of file object 1");
     fileObject1.setDirectory(false);
 
     fileObject2.setName("FO 2");
-    fileObject2.setLength(100);
-    fileObject2.setLastModified(101L);
+    fileObject2.setLength(100L);
+    fileObject2.setCommitDate(101L);
     fileObject2.setPath("/path/object/2");
     fileObject2.setDescription("description of file object 2");
     fileObject2.setDirectory(true);
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
index 7b205c732a..0023ea4556 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
@@ -122,7 +122,7 @@ public class SourceRootResourceTest extends RepositoryTestBase {
     fileObject1.setDescription("File object 1");
     fileObject1.setPath("/foo/bar/fo1");
     fileObject1.setLength(1024L);
-    fileObject1.setLastModified(0L);
+    fileObject1.setCommitDate(0L);
     parent.addChild(fileObject1);
 
     FileObject fileObject2 = new FileObject();
@@ -131,7 +131,7 @@ public class SourceRootResourceTest extends RepositoryTestBase {
     fileObject2.setDescription("File object 2");
     fileObject2.setPath("/foo/bar/fo2");
     fileObject2.setLength(4096L);
-    fileObject2.setLastModified(1234L);
+    fileObject2.setCommitDate(1234L);
     parent.addChild(fileObject2);
 
     return parent;