diff --git a/config/env/development.js b/config/env/development.js
index da024eb8..d90a62cf 100644
--- a/config/env/development.js
+++ b/config/env/development.js
@@ -4,7 +4,7 @@ var defaultEnvConfig = require('./default');
 
 module.exports = {
   db: {
-    uri: process.env.MONGOHQ_URL || process.env.MONGODB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean-dev',
+    uri: process.env.MONGOHQ_URL || process.env.MONGODB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean-dev-v2',
     options: {
       user: '',
       pass: ''
diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js
index 49007462..dcb811f5 100644
--- a/modules/core/client/controllers/home.client.controller.js
+++ b/modules/core/client/controllers/home.client.controller.js
@@ -29,7 +29,9 @@
      * initTopOneInfo
      */
     vm.initTopOneInfo = function () {
-      $('.backdrop').css('backgroundImage', 'url(' + vm.tmdbConfig.backdrop_img_base_url + vm.movieTopOne.torrent_backdrop_img + ')');
+      if (vm.movieTopOne.resource_detail_info.backdrop_path) {
+        $('.backdrop').css('backgroundImage', 'url(' + vm.tmdbConfig.backdrop_img_base_url + vm.movieTopOne.resource_detail_info.backdrop_path + ')');
+      }
     };
 
     /**
@@ -48,11 +50,13 @@
         torrent_type: 'movie',
         limit: 9
       }, function (items) {
-        vm.movieTopOne = items.rows[0];
-        items.rows.splice(0, 1);
-        vm.movieTopList = items.rows;
+        if (items.rows.length > 0) {
+          vm.movieTopOne = items.rows[0];
+          items.rows.splice(0, 1);
+          vm.movieTopList = items.rows;
 
-        vm.initTopOneInfo();
+          vm.initTopOneInfo();
+        }
       }, function (err) {
         Notification.error({
           message: '<i class="glyphicon glyphicon-remove"></i> ' + $translate.instant('TOP_MOVIE_INFO_ERROR')
@@ -65,7 +69,9 @@
         newest: true,
         limit: 14
       }, function (items) {
-        vm.movieNewList = items.rows;
+        if (items.rows.length > 0) {
+          vm.movieNewList = items.rows;
+        }
       }, function (err) {
         Notification.error({
           message: '<i class="glyphicon glyphicon-remove"></i> ' + $translate.instant('TOP_MOVIE_INFO_ERROR')
@@ -82,6 +88,23 @@
       window.open(url, '_blank');
     };
 
+    /**
+     * getDirector
+     * @returns {string}
+     */
+    vm.getDirector = function () {
+      var n = '-';
+
+      if (vm.movieTopOne.resource_detail_info) {
+        angular.forEach(vm.movieTopOne.resource_detail_info.credits.crew, function (item) {
+          if (item.job === 'Director') {
+            n = item.name;
+          }
+        });
+      }
+      return n;
+    };
+
     /**
      * downloadTorrent
      * @param id
diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html
index 71ec4b5e..5d67ea96 100644
--- a/modules/core/client/views/home.client.view.html
+++ b/modules/core/client/views/home.client.view.html
@@ -4,7 +4,8 @@
             <div class="container">
                 <div class="topone">
                     <div class="col-md-4">
-                        <img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{vm.movieTopOne.torrent_img}}" class="img-thumbnail center-block"
+                        <img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{vm.movieTopOne.resource_detail_info.poster_path}}"
+                             class="img-thumbnail center-block"
                              onload="this.style.opacity='1';" ng-click="vm.openTorrentInfo(vm.movieTopOne._id);">
 
                         <div class="down-torrent">
@@ -15,106 +16,71 @@
                     <div class="col-md-8">
                         <dl class="dl-horizontal">
                             <dt class="h-line">{{ 'TMDB_FIELDS.ORIGINAL_TITLE' | translate}}：</dt>
-                            <dd class="h-line">{{vm.movieTopOne.torrent_original_title}}</dd>
+                            <dd class="h-line">{{vm.movieTopOne.resource_detail_info.original_title}}</dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.TITLE' | translate}}：</dt>
-                            <dd class="h-line">{{vm.movieTopOne.torrent_title}}</dd>
+                            <dd class="h-line">{{vm.movieTopOne.resource_detail_info.title}}</dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.DIRECTOR' | translate}}：</dt>
-                            <dd class="h-line">{{vm.movieTopOne.torrent_director}}</dd>
+                            <dd class="h-line">{{vm.getDirector();}}</dd>
 
                             <!--<dt class="h-line">{{ 'TMDB_FIELDS.ORIGINAL_LANGUAGE' | translate}}：</dt>-->
                             <!--<dd class="h-line">{{vm.movieTopOne.torrent_original_language}}</dd>-->
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.GENRES' | translate}}：</dt>
                             <dd class="h-line list-all-genres">
-                                <span class="genres-item" ng-repeat="item in vm.movieTopOne.torrent_genres">{{item}}</span>
+                                <span class="genres-item" ng-repeat="item in vm.movieTopOne.resource_detail_info.genres">{{item.name}}</span>
                             </dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.PRODUCTION_COUNTRIES' | translate}}：</dt>
                             <dd class="h-line list-all-countries">
-                                <span class="country-item" ng-repeat="item in vm.movieTopOne.torrent_countries">{{item}}</span>
-                                <span ng-show="vm.movieTopOne.torrent_countries.length ==0">-</span>
+                                <span class="country-item"
+                                      ng-repeat="item in vm.movieTopOne.resource_detail_info.production_companies">{{item.name}}</span>
+                                <span ng-show="vm.movieTopOne.resource_detail_info.production_companies.length ==0">-</span>
                             </dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.RELEASE_DATE' | translate}}：</dt>
-                            <dd class="h-line">{{vm.movieTopOne.torrent_release}}</dd>
+                            <dd class="h-line">{{vm.movieTopOne.resource_detail_info.release_date}}</dd>
 
-                            <div ng-hide="vm.movieTopOne.torrent_runtime == 0">
+                            <div ng-hide="vm.movieTopOne.resource_detail_info.runtime == 0">
                                 <dt class="h-line">{{ 'TMDB_FIELDS.RUNTIME' | translate}}：</dt>
-                                <dd class="h-line">{{vm.movieTopOne.torrent_runtime | runtime}}</dd>
-                            </div>
-                            <div ng-hide="vm.movieTopOne.torrent_budget == 0">
-                                <dt class="h-line">{{ 'TMDB_FIELDS.BUDGET' | translate}}：</dt>
-                                <dd class="h-line">{{vm.movieTopOne.torrent_budget | dollar:2}}</dd>
+                                <dd class="h-line">{{vm.movieTopOne.resource_detail_info.runtime | runtime}}</dd>
                             </div>
 
-                            <div ng-hide="vm.movieTopOne.torrent_revenue == 0">
+                            <div ng-hide="vm.movieTopOne.resource_detail_info.budget == 0">
+                                <dt class="h-line">{{ 'TMDB_FIELDS.BUDGET' | translate}}：</dt>
+                                <dd class="h-line">{{vm.movieTopOne.resource_detail_info.budget | dollar:2}}</dd>
+                            </div>
+
+                            <div ng-hide="vm.movieTopOne.resource_detail_info.revenue == 0">
                                 <dt class="h-line">{{ 'TMDB_FIELDS.REVENUE' | translate}}：</dt>
-                                <dd class="h-line">{{vm.movieTopOne.torrent_revenue | dollar:2}}</dd>
+                                <dd class="h-line">{{vm.movieTopOne.resource_detail_info.revenue | dollar:2}}</dd>
                             </div>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.VOTE_AVERAGE' | translate}}：</dt>
-                            <dd class="h-line"><span
-                                    class="torrent-votes"><kbd>IMDB</kbd></span> {{vm.movieTopOne.torrent_imdb_votes}} / {{vm.movieTopOne.torrent_imdb_votes_users}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}
+                            <dd class="h-line">
+                                <span ng-show="vm.movieTopOne">
+                                    <span class="torrent-votes">
+                                        <kbd>IMDB</kbd>
+                                    </span> {{vm.movieTopOne.resource_detail_info.vote_average}} / {{vm.movieTopOne.resource_detail_info.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}
+                                </span>
                             </dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.OVERVIEW' | translate}}：</dt>
-                            <dd class="h-line">{{vm.movieTopOne.torrent_overview | limitTo:300}}<span
-                                    ng-show="vm.movieTopOne.torrent_overview.length > 300">......</span></dd>
+                            <dd class="h-line">{{vm.movieTopOne.resource_detail_info.overview | limitTo:300}}
+                                <span ng-show="vm.movieTopOne.resource_detail_info.overview.length > 300">......</span>
+                            </dd>
                         </dl>
                         <legend class="xsmall-legend strong-legend" translate="TMDB_FIELDS.CAST"></legend>
                         <div class="row cast-list">
-                            <div class="col-xs-4 col-md-2 text-center">
-                                <img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{vm.movieTopOne.torrent_cast[0].profile_path}}"
+                            <div class="col-xs-4 col-md-2 text-center"
+                                 ng-repeat="cast in vm.movieTopOne.resource_detail_info.credits.cast | limitTo: 6">
+                                <img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{cast.profile_path}}"
                                      on-error-src="/./modules/core/client/img/default_face.jpg"
                                      class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
-                                <span class="cast-xs-info"><strong>{{vm.movieTopOne.torrent_cast[0].name}}</strong></span>
+                                <span class="cast-xs-info"><strong>{{cast.name}}</strong></span>
 
-                                <p class="cast-xs-info character">{{vm.movieTopOne.torrent_cast[0].character}}</p>
-                            </div>
-                            <div class="col-xs-4 col-md-2 text-center">
-                                <img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{vm.movieTopOne.torrent_cast[1].profile_path}}"
-                                     on-error-src="/./modules/core/client/img/default_face.jpg"
-                                     class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
-                                <span class="cast-xs-info"><strong>{{vm.movieTopOne.torrent_cast[1].name}}</strong></span>
-
-                                <p class="cast-xs-info character">{{vm.movieTopOne.torrent_cast[1].character}}</p>
-                            </div>
-                            <div class="col-xs-4 col-md-2 text-center">
-                                <img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{vm.movieTopOne.torrent_cast[2].profile_path}}"
-                                     on-error-src="/./modules/core/client/img/default_face.jpg"
-                                     class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
-                                <span class="cast-xs-info"><strong>{{vm.movieTopOne.torrent_cast[2].name}}</strong></span>
-
-                                <p class="cast-xs-info character">{{vm.movieTopOne.torrent_cast[2].character}}</p>
-                            </div>
-
-                            <div class="clearfix visible-xs-block visible-sm-block"></div>
-
-                            <div class="col-xs-4 col-md-2 text-center">
-                                <img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{vm.movieTopOne.torrent_cast[3].profile_path}}"
-                                     on-error-src="/./modules/core/client/img/default_face.jpg"
-                                     class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
-                                <span class="cast-xs-info"><strong>{{vm.movieTopOne.torrent_cast[3].name}}</strong></span>
-
-                                <p class="cast-xs-info character">{{vm.movieTopOne.torrent_cast[3].character}}</p>
-                            </div>
-                            <div class="col-xs-4 col-md-2 text-center">
-                                <img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{vm.movieTopOne.torrent_cast[4].profile_path}}"
-                                     on-error-src="/./modules/core/client/img/default_face.jpg"
-                                     class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
-                                <span class="cast-xs-info"><strong>{{vm.movieTopOne.torrent_cast[4].name}}</strong></span>
-
-                                <p class="cast-xs-info character">{{vm.movieTopOne.torrent_cast[4].character}}</p>
-                            </div>
-                            <div class="col-xs-4 col-md-2 text-center">
-                                <img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{vm.movieTopOne.torrent_cast[5].profile_path}}"
-                                     on-error-src="/./modules/core/client/img/default_face.jpg"
-                                     class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
-                                <span class="cast-xs-info"><strong>{{vm.movieTopOne.torrent_cast[5].name}}</strong></span>
-
-                                <p class="cast-xs-info character">{{vm.movieTopOne.torrent_cast[5].character}}</p>
+                                <p class="cast-xs-info character">{{cast.character}}</p>
                             </div>
                         </div>
                     </div>
@@ -132,7 +98,7 @@
                         <div data-ng-if="$index != 0 && $index % 4 == 0" class="clearfix visible-md-block visible-lg-block"></div>
                         <div class="col-xs-6 col-sm-3 col-md-3 col-small-padding">
                             <div class="thumbnail torrent-post-info" ng-click="vm.openTorrentInfo(item._id);">
-                                <img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{item.torrent_img}}" alt="{{item.torrent_title}}"
+                                <img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{item.resource_detail_info.poster_path}}" alt="{{item.resource_detail_info.title}}"
                                      class="img-responsive">
 
                                 <div class="torrent-user-info">
@@ -157,9 +123,9 @@
                                 <div class="torrent-tmdb-info">
                                     <ul class="list-unstyled">
                                         <li>
-                                            <span class="release-date">{{item.torrent_release}}</span>
+                                            <span class="release-date">{{item.resource_detail_info.release_date}}</span>
                                             <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                                  class="pull-right torrent-votes"><kbd>IMDB</kbd> {{item.torrent_imdb_votes}}</span>
+                                                  class="pull-right torrent-votes"><kbd>IMDB</kbd> {{item.resource_detail_info.vote_average}}</span>
                                         </li>
                                     </ul>
                                 </div>
@@ -167,7 +133,7 @@
                                 <div class="caption">
                                     <ul class="list-unstyled">
                                         <li class="text-long">
-                                            <strong>{{item.torrent_title}}</strong>
+                                            <strong>{{item.resource_detail_info.title}}</strong>
                                         </li>
                                     </ul>
                                 </div>
@@ -187,7 +153,7 @@
                                         ng-class="[$index > 0 ? 'hide-big' : 'show-big', $index >= 12 ? 'hide-more' : '']">
                                         <td>
                                             <div class="newest-item-big" ng-click="vm.openTorrentInfo(nt._id);">
-                                                <img ng-src="{{vm.tmdbConfig.backdrop_img_base_url_300}}{{nt.torrent_backdrop_img}}"
+                                                <img ng-src="{{vm.tmdbConfig.backdrop_img_base_url_300}}{{nt.resource_detail_info.backdrop_path}}"
                                                      on-error-src="/./modules/torrents/client/img/default_backdrop_300.jpg">
 
                                                 <div class="newest-user-info">
@@ -211,13 +177,13 @@
 
                                                 <div class="newest-info">
                                                     <div class="text-long">
-                                                        {{$index + 1}}. {{nt.torrent_title}}
+                                                        {{$index + 1}}. {{nt.resource_detail_info.title}}
                                                     </div>
                                                 </div>
                                             </div>
 
                                             <div class="newest-item-small text-long">
-                                                {{$index + 1}}. {{nt.torrent_title}}
+                                                {{$index + 1}}. {{nt.resource_detail_info.title}}
                                             </div>
                                         </td>
                                     </tr>
diff --git a/modules/core/server/controllers/errors.server.controller.js b/modules/core/server/controllers/errors.server.controller.js
index 027f8b9f..817f99de 100644
--- a/modules/core/server/controllers/errors.server.controller.js
+++ b/modules/core/server/controllers/errors.server.controller.js
@@ -39,6 +39,8 @@ var getUniqueErrorMessage = function (err) {
 exports.getErrorMessage = function (err) {
   var message = '';
 
+  console.log(err);
+
   if (err.code) {
     switch (err.code) {
       case 11000:
diff --git a/modules/torrents/client/controllers/admin/admin-list.client.controller.js b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
index 74d88d4d..2bcec81a 100644
--- a/modules/torrents/client/controllers/admin/admin-list.client.controller.js
+++ b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
@@ -343,7 +343,8 @@
 
       ModalConfirmService.showModal({}, modalOptions)
         .then(function (result) {
-          item.$remove(function (response) {
+          var dt = new TorrentsService(item);
+          dt.$remove(function (response) {
             successCallback(response);
           }, function (errorResponse) {
             errorCallback(errorResponse);
diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js
index f2585c2d..4d03444e 100644
--- a/modules/torrents/client/controllers/torrent-info.client.controller.js
+++ b/modules/torrents/client/controllers/torrent-info.client.controller.js
@@ -118,9 +118,10 @@
       vm.torrentLocalInfo = TorrentsService.get({
         torrentId: $stateParams.torrentId
       }, function (res) {
-        if (res.torrent_backdrop_img) {
-          $('.backdrop').css('backgroundImage', 'url(' + vm.tmdbConfig.backdrop_img_base_url + res.torrent_backdrop_img + ')');
+        if (res.resource_detail_info.backdrop_path) {
+          $('.backdrop').css('backgroundImage', 'url(' + vm.tmdbConfig.backdrop_img_base_url + res.resource_detail_info.backdrop_path + ')');
         }
+
         vm.commentBuildPager();
 
         vm.torrentTabs.push(
@@ -189,6 +190,7 @@
         tmdbid: tmdb_id,
         language: getStorageLangService.getLang()
       }, function (res) {
+        res.release_date = $filter('date')(res.release_date, 'yyyy');
         vm.doUpdateTorrentInfo(res);
       }, function (err) {
         Notification.error({
@@ -246,6 +248,23 @@
       return tmp;
     };
 
+    /**
+     * getDirector
+     * @returns {string}
+     */
+    vm.getDirector = function () {
+      var n = '-';
+
+      if (vm.torrentLocalInfo.resource_detail_info) {
+        angular.forEach(vm.torrentLocalInfo.resource_detail_info.credits.crew, function (item) {
+          if (item.job === 'Director') {
+            n = item.name;
+          }
+        });
+      }
+      return n;
+    };
+
     /**
      * getVideoNfoHtml
      * @returns {*}
@@ -558,7 +577,7 @@
       vm.sFile = undefined;
       // Show error message
       Notification.error({
-        message: res.data,
+        message: res.data.message,
         title: '<i class="glyphicon glyphicon-remove"></i> ' + $translate.instant('SUBTITLE_UPLOAD_FAILED')
       });
     }
@@ -703,7 +722,7 @@
 
       ModalConfirmService.showModal({}, modalOptions)
         .then(function (result) {
-          vm.getMovieInfo(vm.torrentLocalInfo.torrent_tmdb_id);
+          vm.getMovieInfo(vm.torrentLocalInfo.resource_detail_info.id);
         });
     };
 
@@ -712,62 +731,7 @@
      * @param minfo
      */
     vm.doUpdateTorrentInfo = function (movieinfo) {
-      var d = new Date(movieinfo.release_date);
-
-      var g = [];
-      angular.forEach(movieinfo.genres, function (item) {
-        g.push(item.name);
-      });
-
-      var com = [];
-      angular.forEach(movieinfo.production_companies, function (item) {
-        com.push(item.name);
-      });
-
-      var country = [];
-      angular.forEach(movieinfo.production_countries, function (item) {
-        country.push(item.iso_3166_1);
-      });
-
-      var casts = [];
-      var i = 0;
-      angular.forEach(movieinfo.credits.cast, function (item) {
-        if (i < 6) {
-          var c = {
-            name: item.name,
-            character: item.character,
-            profile_path: item.profile_path
-          };
-          casts.push(c);
-          i++;
-        }
-      });
-
-      var dir = undefined;
-      angular.forEach(movieinfo.credits.crew, function (item) {
-        if (item.job === 'Director') {
-          dir = item.name;
-        }
-      });
-
-      vm.torrentLocalInfo.torrent_title = movieinfo.title;
-      vm.torrentLocalInfo.torrent_original_title = movieinfo.original_title;
-      vm.torrentLocalInfo.torrent_original_language = movieinfo.original_language;
-      vm.torrentLocalInfo.torrent_tagline = movieinfo.tagline;
-      vm.torrentLocalInfo.torrent_overview = movieinfo.overview;
-      vm.torrentLocalInfo.torrent_genres = g;
-      vm.torrentLocalInfo.torrent_companies = com;
-      vm.torrentLocalInfo.torrent_countries = country;
-      vm.torrentLocalInfo.torrent_cast = casts;
-      vm.torrentLocalInfo.torrent_director = dir;
-      vm.torrentLocalInfo.torrent_imdb_votes = movieinfo.vote_average;
-      vm.torrentLocalInfo.torrent_imdb_votes_users = movieinfo.vote_count;
-      vm.torrentLocalInfo.torrent_runtime = movieinfo.runtime;
-      vm.torrentLocalInfo.torrent_budget = movieinfo.budget;
-      vm.torrentLocalInfo.torrent_revenue = movieinfo.revenue;
-      vm.torrentLocalInfo.torrent_img = movieinfo.poster_path;
-      vm.torrentLocalInfo.torrent_backdrop_img = movieinfo.backdrop_path;
-      vm.torrentLocalInfo.torrent_release = d.getFullYear();
+      vm.torrentLocalInfo.resource_detail_info = movieinfo;
 
       vm.torrentLocalInfo.$update(function (response) {
         successCallback(response);
diff --git a/modules/torrents/client/controllers/uploads.client.controller.js b/modules/torrents/client/controllers/uploads.client.controller.js
index c8f385a9..633a2913 100644
--- a/modules/torrents/client/controllers/uploads.client.controller.js
+++ b/modules/torrents/client/controllers/uploads.client.controller.js
@@ -6,10 +6,10 @@
     .controller('TorrentsUploadController', TorrentsUploadController);
 
   TorrentsUploadController.$inject = ['$scope', '$state', '$translate', '$timeout', 'Authentication', 'MeanTorrentConfig', 'Upload', 'Notification',
-    'TorrentsService', 'getStorageLangService'];
+    'TorrentsService', 'getStorageLangService', '$filter'];
 
   function TorrentsUploadController($scope, $state, $translate, $timeout, Authentication, MeanTorrentConfig, Upload, Notification,
-                                    TorrentsService, getStorageLangService) {
+                                    TorrentsService, getStorageLangService, $filter) {
     var vm = this;
     vm.announce = MeanTorrentConfig.meanTorrentConfig.announce;
     vm.tmdbConfig = MeanTorrentConfig.meanTorrentConfig.tmdbConfig;
@@ -140,6 +140,8 @@
 
         console.log(res);
         vm.movieinfo = res;
+
+        vm.movieinfo.release_date = $filter('date')(vm.movieinfo.release_date, 'yyyy');
       }, function (err) {
         vm.tmdb_info_ok = false;
         vm.tmdb_isloading = false;
@@ -154,13 +156,15 @@
      * create
      */
     vm.create = function () {
-      var d = new Date(vm.movieinfo.release_date);
+      //var d = new Date(vm.movieinfo.release_date);
       var l = 0;
 
       //console.log(vm.torrentInfo);
 
       if (vm.torrentInfo.length !== undefined) {
         l = vm.torrentInfo.length;
+      } else if (vm.torrentInfo.info.length !== undefined) {
+        l = vm.torrentInfo.info.length;
       } else {
         angular.forEach(vm.torrentInfo.info.files, function (item) {
           l = l + item.length;
@@ -181,71 +185,53 @@
         });
       });
 
-      var g = [];
-      angular.forEach(vm.movieinfo.genres, function (item) {
-        g.push(item.name);
-      });
-
-      var com = [];
-      angular.forEach(vm.movieinfo.production_companies, function (item) {
-        com.push(item.name);
-      });
-
-      var country = [];
-      angular.forEach(vm.movieinfo.production_countries, function (item) {
-        country.push(item.iso_3166_1);
-      });
-
-      var casts = [];
-      var i = 0;
-      angular.forEach(vm.movieinfo.credits.cast, function (item) {
-        if (i < 6) {
-          var c = {
-            name: item.name,
-            character: item.character,
-            profile_path: item.profile_path
-          };
-          casts.push(c);
-          i++;
-        }
-      });
-
-      var dir = undefined;
-      angular.forEach(vm.movieinfo.credits.crew, function (item) {
-        if (item.job === 'Director') {
-          dir = item.name;
-        }
-      });
+      //var g = [];
+      //angular.forEach(vm.movieinfo.genres, function (item) {
+      //  g.push(item.name);
+      //});
+      //
+      //var com = [];
+      //angular.forEach(vm.movieinfo.production_companies, function (item) {
+      //  com.push(item.name);
+      //});
+      //
+      //var country = [];
+      //angular.forEach(vm.movieinfo.production_countries, function (item) {
+      //  country.push(item.iso_3166_1);
+      //});
+      //
+      //var casts = [];
+      //var i = 0;
+      //angular.forEach(vm.movieinfo.credits.cast, function (item) {
+      //  if (i < 6) {
+      //    var c = {
+      //      name: item.name,
+      //      character: item.character,
+      //      profile_path: item.profile_path
+      //    };
+      //    casts.push(c);
+      //    i++;
+      //  }
+      //});
+      //
+      //var dir = undefined;
+      //angular.forEach(vm.movieinfo.credits.crew, function (item) {
+      //  if (item.job === 'Director') {
+      //    dir = item.name;
+      //  }
+      //});
 
 
       var torrent = new TorrentsService({
         info_hash: vm.torrentInfo.info_hash,
         torrent_filename: vm.torrentInfo.filename,
-        torrent_tmdb_id: vm.tmdb_id,
-        torrent_imdb_id: vm.movieinfo.imdb_id,
-        torrent_title: vm.movieinfo.title,
-        torrent_original_title: vm.movieinfo.original_title,
-        torrent_original_language: vm.movieinfo.original_language,
-        torrent_tagline: vm.movieinfo.tagline,
-        torrent_overview: vm.movieinfo.overview,
         torrent_type: 'movie',
-        torrent_genres: g,
-        torrent_companies: com,
-        torrent_countries: country,
-        torrent_cast: casts,
-        torrent_director: dir,
         torrent_tags: t,
         torrent_nfo: vm.videoNfo,
         torrent_announce: vm.torrentInfo.announce,
-        torrent_imdb_votes: vm.movieinfo.vote_average,
-        torrent_imdb_votes_users: vm.movieinfo.vote_count,
-        torrent_runtime: vm.movieinfo.runtime,
-        torrent_budget: vm.movieinfo.budget,
-        torrent_revenue: vm.movieinfo.revenue,
         torrent_size: l,
-        torrent_img: vm.movieinfo.poster_path,
-        torrent_backdrop_img: vm.movieinfo.backdrop_path,
-        torrent_release: d.getFullYear()
+
+        resource_detail_info: vm.movieinfo
       });
 
       torrent.$save(function (response) {
diff --git a/modules/torrents/client/views/admin/admin-list.client.view.html b/modules/torrents/client/views/admin/admin-list.client.view.html
index 6ce8d039..f48eae70 100644
--- a/modules/torrents/client/views/admin/admin-list.client.view.html
+++ b/modules/torrents/client/views/admin/admin-list.client.view.html
@@ -124,11 +124,12 @@
                         <td class="col-md-7 td-text-overflow">
                             <div class="media">
                                 <div class="media-left">
-                                    <img class="media-object" ng-src="{{vm.tmdbConfig.poster_list_base_url}}{{item.torrent_img}}" alt="...">
+                                    <img class="media-object" ng-src="{{vm.tmdbConfig.poster_list_base_url}}{{item.resource_detail_info.poster_path}}"
+                                         alt="...">
                                 </div>
                                 <div class="media-body">
-                                    <h5 class="media-heading">{{item.torrent_original_title}}
-                                        <span ng-show="item.torrent_original_title!=item.torrent_title"> / {{item.torrent_title}}</span>
+                                    <h5 class="media-heading">{{item.resource_detail_info.original_title}}
+                                        <span ng-show="item.resource_detail_info.original_title!=item.resource_detail_info.title"> / {{item.resource_detail_info.title}}</span>
                                         <span class="upload-by" ng-show="item.user.displayName"> (By: {{item.user.displayName}})</span>
                                     <span class="label label-download text-uppercase"
                                           title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
@@ -138,7 +139,7 @@
                                     </h5>
 
                                     <div class="list-all-genres">
-                                        <span class="genres-item" ng-repeat="t in item.torrent_genres">{{t}}</span>
+                                        <span class="genres-item" ng-repeat="t in item.resource_detail_info.genres">{{t.name}}</span>
                                     </div>
 
                                     <div class="torrent-filename text-long">{{item.torrent_filename | filename}}</div>
@@ -146,8 +147,8 @@
                                     <div class="list-all-tags">
                                         <!--<span class="label label-success text-uppercase">{{ item.torrent_type}}</span>-->
                                     <span class="label label-release label-warning"
-                                          ng-click="vm.onReleaseClicked(item.torrent_release); $event.stopPropagation();">
-                                        {{ item.torrent_release}}
+                                          ng-click="vm.onReleaseClicked(item.resource_detail_info.release_date); $event.stopPropagation();">
+                                        {{ item.resource_detail_info.release_date}}
                                     </span>
                                     <span class="label label-rlevel label-info"
                                           ng-click="vm.onRLevelClicked(item.torrent_recommended); $event.stopPropagation();"
@@ -172,7 +173,7 @@
                         </td>
                         <td class="col-md-1 td-v-middle">
                             <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                  class="torrent-votes"><kbd>IMDB</kbd> {{item.torrent_imdb_votes | number : 1}}</span>
+                                  class="torrent-votes"><kbd>IMDB</kbd> {{item.resource_detail_info.vote_average | number : 1}}</span>
                         </td>
                         <td class="col-md-1 td-v-middle text-center">{{item.createdat | life}}</td>
                         <td class="col-md-1 td-v-middle text-center">{{item.torrent_size | bytes:2}}</td>
diff --git a/modules/torrents/client/views/movie-list.client.view.html b/modules/torrents/client/views/movie-list.client.view.html
index 776e6bb0..7360ec74 100644
--- a/modules/torrents/client/views/movie-list.client.view.html
+++ b/modules/torrents/client/views/movie-list.client.view.html
@@ -6,7 +6,8 @@
             <div data-ng-if="$index != 0 && $index % 6 == 0" class="clearfix visible-md-block visible-lg-block"></div>
             <div class="col-xs-6 col-sm-4 col-md-2 col-small-padding">
                 <div class="thumbnail torrent-post-info" ng-click="vm.openTorrentInfo(item._id);">
-                    <img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{item.torrent_img}}" alt="{{item.torrent_title}}"
+                    <img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{item.resource_detail_info.poster_path}}"
+                         alt="{{item.resource_detail_info.title}}"
                          class="img-responsive">
 
                     <div class="torrent-user-info">
@@ -31,9 +32,9 @@
                     <div class="torrent-tmdb-info">
                         <ul class="list-unstyled">
                             <li>
-                                <span class="release-date">{{item.torrent_release}}</span>
+                                <span class="release-date">{{item.resource_detail_info.release_date}}</span>
                                     <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                          class="pull-right torrent-votes"><kbd>IMDB</kbd> {{item.torrent_imdb_votes}}</span>
+                                          class="pull-right torrent-votes"><kbd>IMDB</kbd> {{item.resource_detail_info.vote_average}}</span>
                             </li>
                         </ul>
                     </div>
@@ -41,7 +42,7 @@
                     <div class="caption">
                         <ul class="list-unstyled">
                             <li class="text-long">
-                                <strong>{{item.torrent_title}}</strong>
+                                <strong>{{item.resource_detail_info.title}}</strong>
                             </li>
                         </ul>
                     </div>
@@ -140,11 +141,12 @@
                         <td class="col-md-7 td-text-overflow">
                             <div class="media">
                                 <div class="media-left">
-                                    <img class="media-object" ng-src="{{vm.tmdbConfig.poster_list_base_url}}{{item.torrent_img}}" alt="...">
+                                    <img class="media-object" ng-src="{{vm.tmdbConfig.poster_list_base_url}}{{item.resource_detail_info.poster_path}}"
+                                         alt="...">
                                 </div>
                                 <div class="media-body">
-                                    <h5 class="media-heading">{{item.torrent_original_title}}
-                                        <span ng-show="item.torrent_original_title!=item.torrent_title"> / {{item.torrent_title}}</span>
+                                    <h5 class="media-heading">{{item.resource_detail_info.original_title}}
+                                        <span ng-show="item.resource_detail_info.original_title!=item.resource_detail_info.title"> / {{item.resource_detail_info.title}}</span>
                                     <span class="label label-download text-uppercase"
                                           title="{{ 'TITLE_ALT.DOWNLOAD_TORRENT' | translate}}"
                                           ng-click="vm.downloadTorrent(item._id); $event.stopPropagation();">
@@ -153,7 +155,7 @@
                                     </h5>
 
                                     <div class="list-all-genres">
-                                        <span class="genres-item" ng-repeat="t in item.torrent_genres">{{t}}</span>
+                                        <span class="genres-item" ng-repeat="t in item.resource_detail_info.genres">{{t.name}}</span>
                                     </div>
 
                                     <div class="torrent-filename text-long">{{item.torrent_filename | filename}}</div>
@@ -161,8 +163,8 @@
                                     <div class="list-all-tags">
                                         <!--<span class="label label-success text-uppercase">{{ item.torrent_type}}</span>-->
                                     <span class="label label-release label-warning"
-                                          ng-click="vm.onReleaseClicked(item.torrent_release); $event.stopPropagation();">
-                                        {{ item.torrent_release}}
+                                          ng-click="vm.onReleaseClicked(item.resource_detail_info.release_date); $event.stopPropagation();">
+                                        {{ item.resource_detail_info.release_date}}
                                     </span>
                                     <span class="label label-rlevel label-info"
                                           ng-show="item.torrent_recommended != 'none'"
@@ -187,7 +189,7 @@
                         </td>
                         <td class="col-md-1 td-v-middle">
                             <span title="{{ 'TITLE_ALT.IMDB_VOTES' | translate}}"
-                                  class="torrent-votes"><kbd>IMDB</kbd> {{item.torrent_imdb_votes | number : 1}}</span>
+                                  class="torrent-votes"><kbd>IMDB</kbd> {{item.resource_detail_info.vote_average | number : 1}}</span>
                         </td>
                         <td class="col-md-1 td-v-middle text-center">{{item.createdat | life}}</td>
                         <td class="col-md-1 td-v-middle text-center">{{item.torrent_size | bytes:2}}</td>
diff --git a/modules/torrents/client/views/uploads-torrents.client.view.html b/modules/torrents/client/views/uploads-torrents.client.view.html
index 18de01ea..d4cf663d 100644
--- a/modules/torrents/client/views/uploads-torrents.client.view.html
+++ b/modules/torrents/client/views/uploads-torrents.client.view.html
@@ -225,7 +225,7 @@
         </div>
     </div>
 
-    <div class="row" ng-show="vm.tmdb_info_ok == true" style="margin-top: 60px;">
+    <div class="row margin-bottom-30" ng-show="vm.tmdb_info_ok == true" style="margin-top: 60px;">
         <div class="col-md-12 col-sm-12 col-xs-12">
             <legend class="small-legend" translate="TORRENTS_SUBMIT_UPLOAD"></legend>
             <div class="col-sm-6 col-sm-offset-3 text-center">
diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html
index 51ad295c..abd0bc5f 100644
--- a/modules/torrents/client/views/view-torrent.client.view.html
+++ b/modules/torrents/client/views/view-torrent.client.view.html
@@ -4,7 +4,8 @@
             <div class="container">
                 <div class="topone" ng-show="vm.torrentLocalInfo">
                     <div class="col-md-4">
-                        <img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{vm.torrentLocalInfo.torrent_img}}" class="img-thumbnail center-block"
+                        <img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{vm.torrentLocalInfo.resource_detail_info.poster_path}}"
+                             class="img-thumbnail center-block"
                              onload="this.style.opacity='1';">
 
                         <div class="down-torrent">
@@ -15,49 +16,52 @@
                     <div class="col-md-8">
                         <dl class="dl-horizontal">
                             <dt class="h-line">{{ 'TMDB_FIELDS.ORIGINAL_TITLE' | translate}}：</dt>
-                            <dd class="h-line">{{vm.torrentLocalInfo.torrent_original_title}}</dd>
+                            <dd class="h-line">{{vm.torrentLocalInfo.resource_detail_info.original_title}}</dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.TITLE' | translate}}：</dt>
-                            <dd class="h-line">{{vm.torrentLocalInfo.torrent_title}}</dd>
+                            <dd class="h-line">{{vm.torrentLocalInfo.resource_detail_info.title}}</dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.DIRECTOR' | translate}}：</dt>
-                            <dd class="h-line">{{vm.torrentLocalInfo.torrent_director}}</dd>
+                            <dd class="h-line">{{vm.getDirector();}}</dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.ORIGINAL_LANGUAGE' | translate}}：</dt>
-                            <dd class="h-line">{{vm.torrentLocalInfo.torrent_original_language}}</dd>
+                            <dd class="h-line">{{vm.torrentLocalInfo.resource_detail_info.original_language}}</dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.GENRES' | translate}}：</dt>
                             <dd class="h-line list-all-genres">
-                                <span class="genres-item" ng-repeat="item in vm.torrentLocalInfo.torrent_genres">{{item}}</span>
+                                <span class="genres-item" ng-repeat="item in vm.torrentLocalInfo.resource_detail_info.genres">{{item.name}}</span>
                             </dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.PRODUCTION_COMPANIES' | translate}}：</dt>
                             <dd class="h-line list-all-companies">
-                                <span class="company-item" ng-repeat="item in vm.torrentLocalInfo.torrent_companies">{{item}}</span>
-                                <span ng-show="vm.torrentLocalInfo.torrent_companies.length ==0">-</span>
+                                <span class="company-item"
+                                      ng-repeat="item in vm.torrentLocalInfo.resource_detail_info.production_companies">{{item.name}}</span>
+                                <span ng-show="vm.torrentLocalInfo.resource_detail_info.production_companies.length ==0">-</span>
                             </dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.PRODUCTION_COUNTRIES' | translate}}：</dt>
                             <dd class="h-line list-all-countries">
-                                <span class="country-item" ng-repeat="item in vm.torrentLocalInfo.torrent_countries">{{item}}</span>
-                                <span ng-show="vm.torrentLocalInfo.torrent_countries.length ==0">-</span>
+                                <span class="country-item"
+                                      ng-repeat="item in vm.torrentLocalInfo.resource_detail_info.production_countries">{{item.iso_3166_1}}</span>
+                                <span ng-show="vm.torrentLocalInfo.resource_detail_info.production_countries.length ==0">-</span>
                             </dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.RELEASE_DATE' | translate}}：</dt>
-                            <dd class="h-line">{{vm.torrentLocalInfo.torrent_release}}</dd>
+                            <dd class="h-line">{{vm.torrentLocalInfo.resource_detail_info.release_date}}</dd>
 
-                            <div ng-hide="vm.torrentLocalInfo.torrent_runtime == 0">
+                            <div ng-hide="vm.torrentLocalInfo.resource_detail_info.runtime == 0">
                                 <dt class="h-line">{{ 'TMDB_FIELDS.RUNTIME' | translate}}：</dt>
-                                <dd class="h-line">{{vm.torrentLocalInfo.torrent_runtime | runtime}}</dd>
-                            </div>
-                            <div ng-hide="vm.torrentLocalInfo.torrent_budget == 0">
-                                <dt class="h-line">{{ 'TMDB_FIELDS.BUDGET' | translate}}：</dt>
-                                <dd class="h-line">{{vm.torrentLocalInfo.torrent_budget | dollar:2}}</dd>
+                                <dd class="h-line">{{vm.torrentLocalInfo.resource_detail_info.runtime | runtime}}</dd>
                             </div>
 
-                            <div ng-hide="vm.torrentLocalInfo.torrent_revenue == 0">
+                            <div ng-hide="vm.torrentLocalInfo.resource_detail_info.budget == 0">
+                                <dt class="h-line">{{ 'TMDB_FIELDS.BUDGET' | translate}}：</dt>
+                                <dd class="h-line">{{vm.torrentLocalInfo.resource_detail_info.budget | dollar:2}}</dd>
+                            </div>
+
+                            <div ng-hide="vm.torrentLocalInfo.resource_detail_info.revenue == 0">
                                 <dt class="h-line">{{ 'TMDB_FIELDS.REVENUE' | translate}}：</dt>
-                                <dd class="h-line">{{vm.torrentLocalInfo.torrent_revenue | dollar:2}}</dd>
+                                <dd class="h-line">{{vm.torrentLocalInfo.resource_detail_info.revenue | dollar:2}}</dd>
                             </div>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.VOTE_AVERAGE' | translate}}：</dt>
@@ -65,73 +69,33 @@
                                 <span ng-show="vm.torrentLocalInfo">
                                     <span class="torrent-votes">
                                         <kbd>IMDB</kbd>
-                                    </span> {{vm.torrentLocalInfo.torrent_imdb_votes}} / {{vm.torrentLocalInfo.torrent_imdb_votes_users}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}
+                                    </span> {{vm.torrentLocalInfo.resource_detail_info.vote_average}} / {{vm.torrentLocalInfo.resource_detail_info.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}
                                 </span>
                             </dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.IMDB_LINK' | translate}}：</dt>
-                            <dd class="h-line"><a href="{{vm.imdbConfig.imdb_link_url}}{{vm.torrentLocalInfo.torrent_imdb_id}}"
-                                                  target="_blank">{{vm.imdbConfig.imdb_link_url}}{{vm.torrentLocalInfo.torrent_imdb_id}}</a></dd>
+                            <dd class="h-line"><a href="{{vm.imdbConfig.imdb_link_url}}{{vm.torrentLocalInfo.resource_detail_info.imdb_id}}"
+                                                  target="_blank">{{vm.imdbConfig.imdb_link_url}}{{vm.torrentLocalInfo.resource_detail_info.imdb_id}}</a>
+                            </dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.TMDB_LINK' | translate}}：</dt>
-                            <dd class="h-line"><a href="{{vm.tmdbConfig.tmdb_link_url}}{{vm.torrentLocalInfo.torrent_tmdb_id}}"
-                                                  target="_blank">{{vm.tmdbConfig.tmdb_link_url}}{{vm.torrentLocalInfo.torrent_tmdb_id}}</a></dd>
+                            <dd class="h-line"><a href="{{vm.tmdbConfig.tmdb_link_url}}{{vm.torrentLocalInfo.resource_detail_info.id}}"
+                                                  target="_blank">{{vm.tmdbConfig.tmdb_link_url}}{{vm.torrentLocalInfo.resource_detail_info.id}}</a>
+                            </dd>
 
                             <dt class="h-line">{{ 'TMDB_FIELDS.OVERVIEW' | translate}}：</dt>
-                            <dd class="h-line">{{vm.torrentLocalInfo.torrent_overview}}</dd>
+                            <dd class="h-line">{{vm.torrentLocalInfo.resource_detail_info.overview}}</dd>
                         </dl>
                         <legend class="xsmall-legend strong-legend" translate="TMDB_FIELDS.CAST"></legend>
                         <div class="row cast-list">
-                            <div class="col-xs-4 col-md-2 text-center">
-                                <img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{vm.torrentLocalInfo.torrent_cast[0].profile_path}}"
+                            <div class="col-xs-4 col-md-2 text-center"
+                                 ng-repeat="cast in vm.torrentLocalInfo.resource_detail_info.credits.cast | limitTo: 6">
+                                <img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{cast.profile_path}}"
                                      on-error-src="/./modules/core/client/img/default_face.jpg"
                                      class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
-                                <span class="cast-xs-info"><strong>{{vm.torrentLocalInfo.torrent_cast[0].name}}</strong></span>
+                                <span class="cast-xs-info"><strong>{{cast.name}}</strong></span>
 
-                                <p class="cast-xs-info character">{{vm.torrentLocalInfo.torrent_cast[0].character}}</p>
-                            </div>
-                            <div class="col-xs-4 col-md-2 text-center">
-                                <img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{vm.torrentLocalInfo.torrent_cast[1].profile_path}}"
-                                     on-error-src="/./modules/core/client/img/default_face.jpg"
-                                     class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
-                                <span class="cast-xs-info"><strong>{{vm.torrentLocalInfo.torrent_cast[1].name}}</strong></span>
-
-                                <p class="cast-xs-info character">{{vm.torrentLocalInfo.torrent_cast[1].character}}</p>
-                            </div>
-                            <div class="col-xs-4 col-md-2 text-center">
-                                <img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{vm.torrentLocalInfo.torrent_cast[2].profile_path}}"
-                                     on-error-src="/./modules/core/client/img/default_face.jpg"
-                                     class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
-                                <span class="cast-xs-info"><strong>{{vm.torrentLocalInfo.torrent_cast[2].name}}</strong></span>
-
-                                <p class="cast-xs-info character">{{vm.torrentLocalInfo.torrent_cast[2].character}}</p>
-                            </div>
-
-                            <div class="clearfix visible-xs-block visible-sm-block"></div>
-
-                            <div class="col-xs-4 col-md-2 text-center">
-                                <img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{vm.torrentLocalInfo.torrent_cast[3].profile_path}}"
-                                     on-error-src="/./modules/core/client/img/default_face.jpg"
-                                     class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
-                                <span class="cast-xs-info"><strong>{{vm.torrentLocalInfo.torrent_cast[3].name}}</strong></span>
-
-                                <p class="cast-xs-info character">{{vm.torrentLocalInfo.torrent_cast[3].character}}</p>
-                            </div>
-                            <div class="col-xs-4 col-md-2 text-center">
-                                <img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{vm.torrentLocalInfo.torrent_cast[4].profile_path}}"
-                                     on-error-src="/./modules/core/client/img/default_face.jpg"
-                                     class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
-                                <span class="cast-xs-info"><strong>{{vm.torrentLocalInfo.torrent_cast[4].name}}</strong></span>
-
-                                <p class="cast-xs-info character">{{vm.torrentLocalInfo.torrent_cast[4].character}}</p>
-                            </div>
-                            <div class="col-xs-4 col-md-2 text-center">
-                                <img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{vm.torrentLocalInfo.torrent_cast[5].profile_path}}"
-                                     on-error-src="/./modules/core/client/img/default_face.jpg"
-                                     class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
-                                <span class="cast-xs-info"><strong>{{vm.torrentLocalInfo.torrent_cast[5].name}}</strong></span>
-
-                                <p class="cast-xs-info character">{{vm.torrentLocalInfo.torrent_cast[5].character}}</p>
+                                <p class="cast-xs-info character">{{cast.character}}</p>
                             </div>
                         </div>
                     </div>
@@ -302,7 +266,7 @@
                 <dt class="h-line">{{ 'ATTRIBUTE_TAGS' | translate}}：</dt>
                 <dd class="h-line">
                     <div class="list-all-tags">
-                        <span class="label label-release label-warning">{{ vm.torrentLocalInfo.torrent_release}}</span>
+                        <span class="label label-release label-warning">{{ vm.torrentLocalInfo.resource_detail_info.release_date}}</span>
                         <span ng-repeat="t in vm.torrentLocalInfo.torrent_tags">
                             <span class="label label-tag">
                                 {{ 'RESOURCESTAGS.' + vm.getTagTitle(t) + '.' + t | translate}}
@@ -323,13 +287,14 @@
                     <!--</span>-->
                 </dd>
 
-                <dt class="h-line">{{ 'ADMIN_BASIC_RLEVEL_SET' | translate}}：</dt>
-                <dd class="h-line">
-                    <span class="label label-rlevel label-info"
-                          ng-show="vm.torrentLocalInfo.torrent_recommended != 'none'">
-                        {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + vm.torrentLocalInfo.torrent_recommended.toUpperCase() | translate}}
-                    </span>
-                </dd>
+                <div ng-show="vm.torrentLocalInfo.torrent_recommended != 'none'">
+                    <dt class="h-line">{{ 'ADMIN_BASIC_RLEVEL_SET' | translate}}：</dt>
+                    <dd class="h-line">
+                        <span class="label label-rlevel label-info">
+                            {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + vm.torrentLocalInfo.torrent_recommended.toUpperCase() | translate}}
+                        </span>
+                    </dd>
+                </div>
 
                 <dt class="h-line" ng-show="vm.torrentLocalInfo.torrent_nfo.length>0">{{ 'VIDEO_NFO' | translate}}：</dt>
                 <dd class="h-line" ng-show="vm.torrentLocalInfo.torrent_nfo.length>0">
@@ -517,7 +482,7 @@
 
                                     <div class="list-all-tags">
                                         <span class="label label-warning" ng-click="$event.stopPropagation();">
-                                        {{ item.torrent_release}}
+                                        {{ vm.torrentLocalInfo.resource_detail_info.release_date}}
                                         </span>
                                         <span class="label label-sale" ng-if="item.isSaling"
                                               title="{{vm.getSaleTypeDesc(item);}} | {{ 'SALE_EXPIRES_TIME' | translate}}: {{item.torrent_sale_expires | date: 'MM-dd HH:mm'}}"
diff --git a/modules/torrents/server/controllers/subtitles.server.controller.js b/modules/torrents/server/controllers/subtitles.server.controller.js
index c53fb363..53fa2b51 100644
--- a/modules/torrents/server/controllers/subtitles.server.controller.js
+++ b/modules/torrents/server/controllers/subtitles.server.controller.js
@@ -81,7 +81,7 @@ exports.create = function (req, res) {
       })
       .catch(function (err) {
         res.status(422).send({
-          message: errorHandler.getErrorMessage(err)
+          message: err
         });
       });
   } else {
diff --git a/modules/torrents/server/controllers/torrents.server.controller.js b/modules/torrents/server/controllers/torrents.server.controller.js
index 97f94611..9ae98fbc 100644
--- a/modules/torrents/server/controllers/torrents.server.controller.js
+++ b/modules/torrents/server/controllers/torrents.server.controller.js
@@ -317,24 +317,7 @@ exports.update = function (req, res) {
   //torrent.info_hash = req.body.info_hash;
   //torrent.tmdb_id = req.body.tmdb_id;
 
-  torrent.torrent_title = req.body.torrent_title;
-  torrent.torrent_original_title = req.body.torrent_original_title;
-  torrent.torrent_original_language = req.body.torrent_original_language;
-  torrent.torrent_tagline = req.body.torrent_tagline;
-  torrent.torrent_overview = req.body.torrent_overview;
-  torrent.torrent_genres = req.body.torrent_genres;
-  torrent.torrent_companies = req.body.torrent_companies;
-  torrent.torrent_countries = req.body.torrent_countries;
-  torrent.torrent_cast = req.body.torrent_cast;
-  torrent.torrent_director = req.body.torrent_director;
-  torrent.torrent_imdb_votes = req.body.torrent_imdb_votes;
-  torrent.torrent_imdb_votes_users = req.body.torrent_imdb_votes_users;
-  torrent.torrent_runtime = req.body.torrent_runtime;
-  torrent.torrent_budget = req.body.torrent_budget;
-  torrent.torrent_revenue = req.body.torrent_revenue;
-  torrent.torrent_img = req.body.torrent_img;
-  torrent.torrent_backdrop_img = req.body.torrent_backdrop_img;
-  torrent.torrent_release = req.body.torrent_release;
+  torrent.resource_detail_info = req.body.resource_detail_info;
 
   torrent.save(function (err) {
     if (err) {
@@ -528,13 +511,13 @@ exports.list = function (req, res) {
     condition.torrent_tags = {$all: tagsA};
   }
   if (release !== undefined) {
-    condition.torrent_release = release;
+    condition['resource_detail_info.release_date'] = release;
   }
   if (keysA.length > 0) {
     condition.$or = [
       {torrent_filename: {'$all': keysA}},
-      {torrent_title: {'$all': keysA}},
-      {torrent_original_title: {'$all': keysA}}
+      {'resource_detail_info.title': {'$all': keysA}},
+      {'resource_detail_info.original_title': {'$all': keysA}}
     ];
   }
 
@@ -627,14 +610,15 @@ exports.torrentByID = function (req, res, next, id) {
   };
 
   var findOtherTorrents = function (torrent, callback) {
-    var condition = {};
-    condition.torrent_status = 'reviewed';
-    condition.torrent_type = 'movie';
-    condition.torrent_tmdb_id = torrent.torrent_tmdb_id;
+    var condition = {
+      torrent_status: 'reviewed',
+      torrent_type: 'movie',
+      'resource_detail_info.id': torrent.resource_detail_info.id
+    };
 
     console.log(condition);
 
-    var fields = 'user torrent_filename torrent_release torrent_tags torrent_seeds torrent_leechers torrent_finished torrent_size torrent_sale_status torrent_sale_expires createdat';
+    var fields = 'user torrent_filename torrent_tags torrent_seeds torrent_leechers torrent_finished torrent_size torrent_sale_status torrent_sale_expires createdat';
 
     Torrent.find(condition, fields)
       .sort('-createdat')
diff --git a/modules/torrents/server/models/torrent.server.model.js b/modules/torrents/server/models/torrent.server.model.js
index fc96790a..55f4be69 100644
--- a/modules/torrents/server/models/torrent.server.model.js
+++ b/modules/torrents/server/models/torrent.server.model.js
@@ -36,27 +36,6 @@ var CommentSchema = new Schema({
 });
 
 
-/**
- * Sub cast Schema
- */
-var CastSchema = new Schema({
-  name: {
-    type: String,
-    default: '',
-    trim: true
-  },
-  profile_path: {
-    type: String,
-    default: '',
-    trim: true
-  },
-  character: {
-    type: String,
-    default: '',
-    trim: true
-  }
-});
-
 /**
  * Torrent Schema
  */
@@ -77,69 +56,11 @@ var TorrentSchema = new Schema({
     trim: true,
     required: 'filename cannot be blank'
   },
-  torrent_tmdb_id: {
-    type: String,
-    default: '',
-    trim: true,
-    required: 'tmdb id cannot be blank'
-  },
-  torrent_imdb_id: {
-    type: String,
-    default: '',
-    trim: true
-  },
-  torrent_title: {
-    type: String,
-    default: '',
-    trim: true,
-    required: 'title cannot be blank'
-  },
-  torrent_original_title: {
-    type: String,
-    default: '',
-    trim: true
-  },
-  torrent_original_language: {
-    type: String,
-    default: '',
-    trim: true
-  },
-  torrent_tagline: {
-    type: String,
-    default: '',
-    trim: true
-  },
-  torrent_overview: {
-    type: String,
-    default: '',
-    trim: true
-  },
   torrent_type: {
     type: String,
     default: 'movie',
     trim: true
   },
-  torrent_genres: {
-    type: [String],
-    default: '',
-    trim: true
-  },
-  torrent_companies: {
-    type: [String],
-    default: '',
-    trim: true
-  },
-  torrent_countries: {
-    type: [String],
-    default: '',
-    trim: true
-  },
-  torrent_director: {
-    type: String,
-    default: '',
-    trim: true
-  },
-  torrent_cast: [CastSchema],
   torrent_tags: {
     type: [String],
     default: '',
@@ -154,23 +75,7 @@ var TorrentSchema = new Schema({
     default: '',
     trim: true
   },
-  torrent_imdb_votes: {
-    type: Number,
-    default: 0
-  },
-  torrent_imdb_votes_users: {
-    type: Number,
-    default: 0
-  },
-  torrent_runtime: {
-    type: Number,
-    default: 0
-  },
-  torrent_budget: {
-    type: Number,
-    default: 0
-  },
-  torrent_revenue: {
+  torrent_size: {
     type: Number,
     default: 0
   },
@@ -186,25 +91,6 @@ var TorrentSchema = new Schema({
     type: Number,
     default: 0
   },
-  torrent_size: {
-    type: Number,
-    default: 0
-  },
-  torrent_img: {
-    type: String,
-    default: '',
-    trim: true
-  },
-  torrent_backdrop_img: {
-    type: String,
-    default: '',
-    trim: true
-  },
-  torrent_release: {
-    type: String,
-    default: '2017',
-    trim: true
-  },
   torrent_status: {
     type: String,
     default: 'new',
@@ -236,6 +122,10 @@ var TorrentSchema = new Schema({
     default: Date.now
   },
   _other_torrents: [],
+
+  //resource info
+  resource_detail_info: Object,
+
   createdat: {
     type: Date,
     default: Date.now