diff --git a/packages/strapi-generate-api/templates/mongoose/model.settings.template b/packages/strapi-generate-api/templates/mongoose/model.settings.template
index 1918df971b..99bfc2e48a 100755
--- a/packages/strapi-generate-api/templates/mongoose/model.settings.template
+++ b/packages/strapi-generate-api/templates/mongoose/model.settings.template
@@ -5,6 +5,9 @@
     "name": "<%= id %>",
     "description": "<%= description %>"
   },
+  "options": {
+    "timestamps": true
+  },
   "attributes": {
     <%= attributes %>
   }
diff --git a/packages/strapi-mongoose/lib/index.js b/packages/strapi-mongoose/lib/index.js
index a95146d81d..f82e478c17 100755
--- a/packages/strapi-mongoose/lib/index.js
+++ b/packages/strapi-mongoose/lib/index.js
@@ -158,6 +158,8 @@ module.exports = function (strapi) {
                     });
                   });
 
+                  collection.schema.set('timestamps', _.get(definition, 'options.timestamps') === true);
+
                   collection.schema.options.toObject = collection.schema.options.toJSON = {
                     virtuals: true,
                     transform: function (doc, returned, opts) {
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Edit/index.js b/packages/strapi-plugin-content-manager/admin/src/components/Edit/index.js
index 053b9c97e8..cfb9c6af65 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/Edit/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/Edit/index.js
@@ -126,7 +126,8 @@ class Edit extends React.PureComponent {
 
   fileRelationAllowMultipleUpload = (relationName) => has(this.props.schema, ['relations', relationName, 'collection']);
 
-  orderAttributes = (displayedFields) => Object.keys(displayedFields).sort(name => Object.keys(this.getUploadRelations(this.props)).includes(name));
+  // orderAttributes = (displayedFields) => Object.keys(displayedFields).sort(name => Object.keys(this.getUploadRelations(this.props)).includes(name));
+  orderAttributes = (displayedFields) => Object.keys(displayedFields);
 
   render(){
     return (
diff --git a/packages/strapi-plugin-upload/admin/src/components/Li/index.js b/packages/strapi-plugin-upload/admin/src/components/Li/index.js
index 7c3ad83864..71354d7a4a 100644
--- a/packages/strapi-plugin-upload/admin/src/components/Li/index.js
+++ b/packages/strapi-plugin-upload/admin/src/components/Li/index.js
@@ -9,6 +9,7 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import cn from 'classnames';
+import moment from 'moment';
 
 import FileIcon from 'components/FileIcon';
 import IcoContainer from 'components/IcoContainer';
@@ -100,6 +101,12 @@ class Li extends React.Component {
               <FileIcon fileType={item.ext} />
             </div>
             {['hash', 'name', 'updatedAt', 'size', 'relatedTo', ''].map((value, key) => {
+              if (value === 'updatedAt') {
+                return (
+                  <div key={key} className={styles.truncate}>{moment(item[value]).format('YYYY/MM/DD - HH:mm')}</div>
+                );
+              }
+
               if (value === 'size') {
                 const unit = this.getUnit(item[value]);
 
diff --git a/packages/strapi-plugin-upload/models/File.settings.json b/packages/strapi-plugin-upload/models/File.settings.json
index 57ed36057b..520f5ee8c6 100644
--- a/packages/strapi-plugin-upload/models/File.settings.json
+++ b/packages/strapi-plugin-upload/models/File.settings.json
@@ -4,6 +4,9 @@
     "name": "file",
     "description": ""
   },
+  "options": {
+    "timestamps": true
+  },
   "attributes": {
     "name": {
       "type": "string",
diff --git a/packages/strapi-plugin-upload/package.json b/packages/strapi-plugin-upload/package.json
index 482237a2b6..ba1cd2bc0c 100644
--- a/packages/strapi-plugin-upload/package.json
+++ b/packages/strapi-plugin-upload/package.json
@@ -48,4 +48,4 @@
     "npm": ">= 3.0.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-plugin-users-permissions/models/User.settings.json b/packages/strapi-plugin-users-permissions/models/User.settings.json
index 99479b1cba..b9c12b4d13 100644
--- a/packages/strapi-plugin-users-permissions/models/User.settings.json
+++ b/packages/strapi-plugin-users-permissions/models/User.settings.json
@@ -4,6 +4,9 @@
     "name": "user",
     "description": ""
   },
+  "options": {
+    "timestamps": true
+  },
   "attributes": {
     "username": {
       "type": "string",