diff --git a/.gitattributes b/.gitattributes
index c8d6ba3..7ccb1f3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,12 @@
-/_docs             export-ignore
-/tests             export-ignore
-/.editorconfig     export-ignore
-/.gitattributes    export-ignore
-/.gitignore        export-ignore
-/.scrutinizer.yml  export-ignore
-/.travis.yml       export-ignore
-/CONTRIBUTING.md   export-ignore
-/phpunit.xml.dist  export-ignore
+* text=auto
+
+/.github          export-ignore
+/_docs            export-ignore
+/tests            export-ignore
+.editorconfig     export-ignore
+.gitattributes    export-ignore
+.gitignore        export-ignore
+.scrutinizer.yml  export-ignore
+.travis.yml       export-ignore
+phpunit.xml.dist  export-ignore
+CONTRIBUTING.md   export-ignore
diff --git a/database/migrations/2015_02_01_000001_create_blog_categories_table.php b/database/migrations/2015_02_01_000001_create_blog_categories_table.php
index fe614de..d1c172d 100644
--- a/database/migrations/2015_02_01_000001_create_blog_categories_table.php
+++ b/database/migrations/2015_02_01_000001_create_blog_categories_table.php
@@ -8,7 +8,7 @@
  *
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
  *
- * @see \Arcanesoft\Blog\Models\Tag
+ * @see \Arcanesoft\Blog\Models\Category
  */
 class CreateBlogCategoriesTable extends Migration
 {
diff --git a/database/migrations/2015_02_01_000003_create_blog_posts_table.php b/database/migrations/2015_02_01_000003_create_blog_posts_table.php
index 531120f..12be003 100644
--- a/database/migrations/2015_02_01_000003_create_blog_posts_table.php
+++ b/database/migrations/2015_02_01_000003_create_blog_posts_table.php
@@ -7,6 +7,8 @@
  * Class     CreateBlogPostsTable
  *
  * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
+ *
+ * @see \Arcanesoft\Blog\Models\Post
  */
 class CreateBlogPostsTable extends Migration
 {
diff --git a/resources/views/admin/categories/show.blade.php b/resources/views/admin/categories/show.blade.php
index bb5593c..19172cc 100644
--- a/resources/views/admin/categories/show.blade.php
+++ b/resources/views/admin/categories/show.blade.php
@@ -1,4 +1,4 @@
-<?php /** @var  \Arcanesoft\Blog\Models\Category  $category */ ?>
+<?php /** @var  Arcanesoft\Blog\Models\Category  $category */ ?>
 
 @inject('blog', 'Arcanesoft\Blog\Blog')
 
@@ -72,7 +72,7 @@
                     </div>
                 </div>
                 <div class="box-footer text-right">
-                    @can(\Arcanesoft\Blog\Policies\CategoriesPolicy::PERMISSION_UPDATE)
+                    @can(Arcanesoft\Blog\Policies\CategoriesPolicy::PERMISSION_UPDATE)
                         {{ ui_link('edit', route('admin::blog.categories.edit', [$category])) }}
 
                         @if ($category->trashed())
@@ -80,7 +80,7 @@
                         @endif
                     @endcan
 
-                    @can(\Arcanesoft\Blog\Policies\CategoriesPolicy::PERMISSION_DELETE)
+                    @can(Arcanesoft\Blog\Policies\CategoriesPolicy::PERMISSION_DELETE)
                         {{ ui_link('delete', '#delete-category-modal', [], ! $category->isDeletable()) }}
                     @endcan
                 </div>
@@ -114,11 +114,11 @@
                                             <span class="label label-primary">{{ $post->slug }}</span>
                                         </td>
                                         <td class="text-right">
-                                            @can(\Arcanesoft\Blog\Policies\PostsPolicy::PERMISSION_SHOW)
+                                            @can(Arcanesoft\Blog\Policies\PostsPolicy::PERMISSION_SHOW)
                                                 {{ ui_link_icon('show', route('admin::blog.posts.show', [$post])) }}
                                             @endcan
 
-                                            @can(\Arcanesoft\Blog\Policies\PostsPolicy::PERMISSION_UPDATE)
+                                            @can(Arcanesoft\Blog\Policies\PostsPolicy::PERMISSION_UPDATE)
                                                 {{ ui_link_icon('edit', route('admin::blog.posts.edit', [$post])) }}
                                             @endcan
                                         </td>
@@ -140,7 +140,7 @@
 @endsection
 
 @section('modals')
-    @can(\Arcanesoft\Blog\Policies\CategoriesPolicy::PERMISSION_UPDATE)
+    @can(Arcanesoft\Blog\Policies\CategoriesPolicy::PERMISSION_UPDATE)
         @if ($category->trashed())
             {{-- RESTORE MODAL --}}
             <div id="restore-category-modal" class="modal fade" data-backdrop="false" tabindex="-1" role="dialog">
@@ -167,7 +167,7 @@
         @endif
     @endcan
 
-    @can(\Arcanesoft\Blog\Policies\CategoriesPolicy::PERMISSION_DELETE)
+    @can(Arcanesoft\Blog\Policies\CategoriesPolicy::PERMISSION_DELETE)
         {{-- DELETE MODAL --}}
         <div id="delete-category-modal" class="modal fade" data-backdrop="false" tabindex="-1" role="dialog">
             <div class="modal-dialog" role="document">
@@ -195,7 +195,7 @@
 
 @section('scripts')
     {{-- RESTORE SCRIPT --}}
-    @can(\Arcanesoft\Blog\Policies\CategoriesPolicy::PERMISSION_UPDATE)
+    @can(Arcanesoft\Blog\Policies\CategoriesPolicy::PERMISSION_UPDATE)
         @if ($category->trashed())
             <script>
                 $(function () {
@@ -235,7 +235,7 @@
     @endcan
 
     {{-- DELETE SCRIPT --}}
-    @can(\Arcanesoft\Blog\Policies\CategoriesPolicy::PERMISSION_DELETE)
+    @can(Arcanesoft\Blog\Policies\CategoriesPolicy::PERMISSION_DELETE)
         @if ($category->isDeletable())
             <script>
                 $(function () {
diff --git a/resources/views/admin/tags/index.blade.php b/resources/views/admin/tags/index.blade.php
index dfe4c90..1a41c2c 100644
--- a/resources/views/admin/tags/index.blade.php
+++ b/resources/views/admin/tags/index.blade.php
@@ -1,4 +1,4 @@
-<?php /** @var  \Illuminate\Pagination\LengthAwarePaginator  $tags */ ?>
+<?php /** @var  Illuminate\Pagination\LengthAwarePaginator  $tags */ ?>
 
 @inject('blog', 'Arcanesoft\Blog\Blog')
 
@@ -37,7 +37,7 @@
                     </thead>
                     <tbody>
                         @forelse($tags as $tag)
-                            <?php /** @var  \Arcanesoft\Blog\Models\Tag  $tag */ ?>
+                            <?php /** @var  Arcanesoft\Blog\Models\Tag  $tag */ ?>
                             <tr>
                                 <td>
                                     @if ($blog->isTranslatable())
@@ -61,18 +61,18 @@
                                     {{ label_count($tag->posts->count()) }}
                                 </td>
                                 <td class="text-right">
-                                    @can(\Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_SHOW)
+                                    @can(Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_SHOW)
                                         {{ ui_link_icon('show', route('admin::blog.tags.show', [$tag])) }}
                                     @endcan
 
-                                    @can(\Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_UPDATE)
+                                    @can(Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_UPDATE)
                                         {{ ui_link_icon('edit', route('admin::blog.tags.edit', [$tag])) }}
                                         @if ($tag->trashed())
                                             {{ ui_link_icon('restore', '#restore-tag-modal', ['data-tag-id' => $tag->id, 'data-tag-name' => $tag->name]) }}
                                         @endif
                                     @endcan
 
-                                    @can(\Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_DELETE)
+                                    @can(Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_DELETE)
                                         {{ ui_link_icon('delete', '#delete-tag-modal', ['data-tag-id' => $tag->id, 'data-tag-name' => $tag->name]) }}
                                     @endcan
                                 </td>
@@ -96,7 +96,7 @@
 
 @section('modals')
     {{-- RESTORE MODAL --}}
-    @can(\Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_UPDATE)
+    @can(Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_UPDATE)
         @if ($trashed)
             <div id="restore-tag-modal" class="modal fade" data-backdrop="false" tabindex="-1" role="dialog">
                 <div class="modal-dialog" role="document">
@@ -123,7 +123,7 @@
     @endcan
 
     {{-- DELETE MODAL --}}
-    @can(\Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_DELETE)
+    @can(Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_DELETE)
         <div id="delete-tag-modal" class="modal fade" data-backdrop="false" tabindex="-1" role="dialog">
             <div class="modal-dialog" role="document">
                 {{ Form::open(['method' => 'DELETE', 'id' => 'delete-tag-form', 'class' => 'form form-loading', 'autocomplete' => 'off']) }}
@@ -150,7 +150,7 @@
 
 @section('scripts')
     {{-- RESTORE SCRIPT --}}
-    @can(\Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_UPDATE)
+    @can(Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_UPDATE)
         @if ($trashed)
         <script>
             $(function () {
@@ -184,7 +184,7 @@
 
                     axios.put($restoreTagForm.attr('action'))
                          .then(function (response) {
-                             if (response.data.status === 'success') {
+                             if (response.data.code === 'success') {
                                  $restoreTagModal.modal('hide');
                                  location.reload();
                              }
@@ -208,7 +208,7 @@
     @endcan
 
     {{-- DELETE SCRIPT --}}
-    @can(\Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_DELETE)
+    @can(Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_DELETE)
     <script>
         var $deleteTagModal = $('div#delete-tag-modal'),
             $deleteTagForm  = $('form#delete-tag-form'),
@@ -240,7 +240,7 @@
 
             axios.delete($deleteTagForm.attr('action'))
                  .then(function (response) {
-                     if (response.data.status === 'success') {
+                     if (response.data.code === 'success') {
                          $deleteTagModal.modal('hide');
                          location.reload();
                      }
diff --git a/resources/views/admin/tags/show.blade.php b/resources/views/admin/tags/show.blade.php
index f98fd1d..543ee69 100644
--- a/resources/views/admin/tags/show.blade.php
+++ b/resources/views/admin/tags/show.blade.php
@@ -1,4 +1,4 @@
-<?php /** @var  \Arcanesoft\Blog\Models\Tag  $tag */ ?>
+<?php /** @var  Arcanesoft\Blog\Models\Tag  $tag */ ?>
 
 @inject('blog', 'Arcanesoft\Blog\Blog')
 
@@ -73,7 +73,7 @@
                     </div>
                 </div>
                 <div class="box-footer text-right">
-                    @can(\Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_UPDATE)
+                    @can(Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_UPDATE)
                         {{ ui_link('edit', route('admin::blog.tags.edit', [$tag])) }}
 
                         @if ($tag->trashed())
@@ -81,7 +81,7 @@
                         @endif
                     @endcan
 
-                    @can(\Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_DELETE)
+                    @can(Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_DELETE)
                         {{ ui_link('delete', '#delete-tag-modal') }}
                     @endcan
                 </div>
@@ -106,7 +106,7 @@
                             </thead>
                             <tbody>
                                 @forelse ($tag->posts as $post)
-                                    <?php /** @var  \Arcanesoft\Blog\Models\Post  $post */ ?>
+                                    <?php /** @var  Arcanesoft\Blog\Models\Post  $post */ ?>
                                     <tr>
                                         <td style="width: 60px;">
                                             <span class="label label-inverse">{{ strtoupper($post->locale) }}</span>
@@ -116,11 +116,11 @@
                                             <span class="label label-primary">{{ $post->slug }}</span>
                                         </td>
                                         <td class="text-right">
-                                            @can(\Arcanesoft\Blog\Policies\PostsPolicy::PERMISSION_SHOW)
+                                            @can(Arcanesoft\Blog\Policies\PostsPolicy::PERMISSION_SHOW)
                                                 {{ ui_link_icon('show', route('admin::blog.posts.show', [$post])) }}
                                             @endcan
 
-                                            @can(\Arcanesoft\Blog\Policies\PostsPolicy::PERMISSION_UPDATE)
+                                            @can(Arcanesoft\Blog\Policies\PostsPolicy::PERMISSION_UPDATE)
                                                 {{ ui_link_icon('edit', route('admin::blog.posts.edit', [$post])) }}
                                             @endcan
                                         </td>
@@ -143,7 +143,7 @@
 
 @section('modals')
     {{-- RESTORE MODAL --}}
-    @can(\Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_UPDATE)
+    @can(Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_UPDATE)
         @if ($tag->trashed())
             <div id="restore-tag-modal" class="modal fade" data-backdrop="false" tabindex="-1" role="dialog">
                 <div class="modal-dialog" role="document">
@@ -170,7 +170,7 @@
     @endcan
 
     {{-- DELETE MODAL --}}
-    @can(\Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_DELETE)
+    @can(Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_DELETE)
         <div id="delete-tag-modal" class="modal fade" data-backdrop="false" tabindex="-1" role="dialog">
             <div class="modal-dialog" role="document">
                 {{ Form::open(['route' => ['admin::blog.tags.delete', $tag], 'method' => 'DELETE', 'id' => 'delete-tag-form', 'class' => 'form form-loading', 'autocomplete' => 'off']) }}
@@ -197,7 +197,7 @@
 
 @section('scripts')
     {{-- RESTORE SCRIPT --}}
-    @can(\Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_UPDATE)
+    @can(Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_UPDATE)
         @if ($tag->trashed())
         <script>
             $(function () {
@@ -218,7 +218,7 @@
 
                     axios.put($restoreTagForm.attr('action'))
                          .then(function (response) {
-                             if (response.data.status === 'success') {
+                             if (response.data.code === 'success') {
                                  $restoreTagModal.modal('hide');
                                  location.reload();
                              }
@@ -242,7 +242,7 @@
     @endcan
 
     {{-- DELETE SCRIPT --}}
-    @can(\Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_DELETE)
+    @can(Arcanesoft\Blog\Policies\TagsPolicy::PERMISSION_DELETE)
     <script>
         $(function () {
             var $deleteTagModal = $('div#delete-tag-modal'),
@@ -262,7 +262,7 @@
 
                 axios.delete($deleteTagForm.attr('action'))
                      .then(function (response) {
-                         if (response.data.status === 'success') {
+                         if (response.data.code === 'success') {
                              $deleteTagModal.modal('hide');
                              @if ($tag->trashed())
                                  location.replace("{{ route('admin::blog.tags.index') }}");
diff --git a/src/Bases/Migration.php b/src/Bases/Migration.php
index 1158296..dc06aa8 100644
--- a/src/Bases/Migration.php
+++ b/src/Bases/Migration.php
@@ -1,6 +1,6 @@
 <?php namespace Arcanesoft\Blog\Bases;
 
-use Arcanedev\Support\Bases\Migration as BaseMigration;
+use Arcanedev\Support\Database\Migration as BaseMigration;
 
 /**
  * Class     Migration
diff --git a/src/Models/AbstractModel.php b/src/Models/AbstractModel.php
index 522d52c..c9e2e78 100644
--- a/src/Models/AbstractModel.php
+++ b/src/Models/AbstractModel.php
@@ -1,6 +1,6 @@
 <?php namespace Arcanesoft\Blog\Models;
 
-use Arcanedev\Support\Bases\Model as BaseModel;
+use Arcanedev\Support\Database\Model as BaseModel;
 
 /**
  * Class     AbstractModel