diff --git a/composer.json b/composer.json
index 52d3ecd..565ae4b 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,8 @@
     },
     "autoload": {
         "psr-4": {
-            "ProcessMaker\\Package\\PackageSkeleton\\": "src"
+            "ProcessMaker\\Package\\PackageSkeleton\\": "src",
+            "Tests\\": "tests/"
         }
     },
     "extra": {
diff --git a/routes/api.php b/routes/api.php
index 7a08b7d..335e22e 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,5 +1,6 @@
 <?php
-Route::group(['middleware' => ['auth:api', 'bindings']], function() {
-    Route::get('admin/package-skeleton/fetch', 'PackageSkeletonController@fetch')->name('package.skeleton.fetch');
-    Route::apiResource('admin/package-skeleton', 'PackageSkeletonController');
+
+Route::group(['middleware' => ['auth:api', 'bindings']], function () {
+    Route::get('admin/package-skeleton/fetch', [PackageSkeletonController::class, 'fetch'])->name('package.skeleton.fetch');
+    Route::apiResource('admin/package-skeleton', PackageSkeletonController::class);
 });
diff --git a/routes/web.php b/routes/web.php
index fc4ea15..cd0cb96 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,6 +1,6 @@
 <?php
 
 Route::group(['middleware' => ['auth']], function () {
-    Route::get('admin/package-skeleton', 'PackageSkeletonController@index')->name('package.skeleton.index');
-    Route::get('package-skeleton', 'PackageSkeletonController@index')->name('package.skeleton.tab.index');
+    Route::get('admin/package-skeleton', [PackageSkeletonController::class, 'index'])->name('package.skeleton.index');
+    Route::get('package-skeleton', [PackageSkeletonController::class, 'index'])->name('package.skeleton.tab.index');
 });
diff --git a/src/Models/Sample.php b/src/Models/Sample.php
index 198e80a..0639f58 100644
--- a/src/Models/Sample.php
+++ b/src/Models/Sample.php
@@ -2,13 +2,13 @@
 
 namespace ProcessMaker\Package\PackageSkeleton\Models;
 
-use Illuminate\Database\Eloquent\Model;
+use ProcessMaker\Models\ProcessMakerModel;
 
-class Sample extends Model
+class Sample extends ProcessMakerModel
 {
     protected $table = 'sample_skeleton';
 
     protected $fillable = [
-        'id', 'name', 'status'
+        'id', 'name', 'status',
     ];
-}
\ No newline at end of file
+}