diff --git a/UPGRADE.md b/UPGRADE.md
new file mode 100644
index 0000000..34c3f51
--- /dev/null
+++ b/UPGRADE.md
@@ -0,0 +1,31 @@
+# Upgrade Guide
+
+## 0.x to 1.x
+
+Previously we had model within that package you had to extend but now you don't, you just need to use our trait like you would with `HasUlid` & `HasUuid` in Laravel
+
+```diff
+<?php
+
+namespace App\Models;
+
+- use Malico\LaravelNanoid\Eloquent\Model;
++ use Illuminate\Database\Eloquent\Model;
++ use Malico\LaravelNanoid\HasNanoids;
+
+class Payment extends Model {
++    use HasNanoids;
+}
+```
+
+Also, we added, `nanoidPrefix` and `nanoidLength`, like
+
+```php
+public function nanoidLength(): int {
+    return 2;
+}
+
+public function nanoidPrefix(): string {
+    return 'pay_'
+}
+```
diff --git a/readme.md b/readme.md
index 4d3e4f3..297c8dd 100644
--- a/readme.md
+++ b/readme.md
@@ -10,92 +10,31 @@ A simple drop-in solution for providing nanoid support for the IDs of your Eloqu
 
 ## Usage
 
-There are two ways to use this package:
+Use nanoid within your model, use the trait `HasNanoids` within your model like.
 
-- By extending the provided model classes (preferred and simplest method).
-- By using the provided model trait (allows for extending another model class).
-
-### Extend the model classes
-
-While creating your model, you can extend the `Eloquent Model` class provided by the package.
-
-```php
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Malico\LaravelNanoid\Eloquent\Model;
-
-class Book extends Model
-{
-    use HasFactory;
-}
-```
-
-To create model fast and easy, use the artisan command `make:nanoid-model`, same as you will do with the `make:model` command.
-All arguments work the same as the `make:model` command. To create migration file with string id (which is what is needed), add the `-m` option, the migration file created will have id of string type (string) instead of autoincrementing integer type.
-
-### Extend the model trait
-
-With the `ModelTrait` trait, all you need to do is add the trait to your model class, then make you sure model properties look like this:
-
-```php
+```diff
 <?php
 
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-namespace Malico\LaravelNanoid\Eloquent\InteractsWithNanoid;
++ use Malico\LaravelNanoid\HasNanoids;
 
 class Book extends Model{
     use HasFactory;
-    use InteractsWithNanoid;
-
-    /**
-     * Indicates if the IDs are auto-incrementing.
-     *
-     * @var bool
-     */
-    public $incrementing = false;
-
-    /**
-     * The "type" of the auto-incrementing ID.
-     *
-     * @var string
-     */
-    protected $keyType = 'string';
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
-    protected $guarded = [];
-
-    /**
-     * The "booting" method of the model.
-     */
-    protected static function boot(): void
-    {
-        parent::boot();
-
-        static::creating(function (self $model): void {
-            $model->{$model->getKeyName()} = $model->generateNanoid();
-        });
-    }
++   use HasNanoids;
 }
 ```
 
-Take note of the `$incrementing` and `$keyType` properties. Also make sure within your `boot` method you call the `parent::boot` method and then add the `creating` event listener.
-Also make sure your id column is set to `string` type.
+Your migration file should like.
 
-```php
+```diff
 // migration file
 public function up()
 {
     Schema::create('test_models', function (Blueprint $table) {
-        $table->string('id')->primary();
+-       $table->id();
++       $table->string('id')->primary();
         //
         $table->timestamps();
     });
@@ -113,35 +52,32 @@ To create a new migration, use the artisan command `make:nanoid-migration`. All
 <?php
 
     /**
-     * Nano id length.
-     *
      * @var array|int
      */
     protected $nanoidLength = 10;
     // id will be of length 10
     // specifying to array. e.g [10, 20] will generate id of length 10 to 20
 
+    public function nanoidLength(): array|int
+    {
+        // [10,20]
+        return 10;
+    }
+
     /**
-     * Nano id prefix.
-     *
      * @var string
      */
     protected $nanoidPrefix = 'pl_'; // id will look: pl_2k1MzOO2shfwow ...
 
-```
-
-This is inspired by the [Laravel Eloquent UUID](https://github.com/goldspecdigital/laravel-eloquent-uuid) package and stripe's transaction ids.
-
-If you want to customize the user model, Replace the follows namespace in your user model.
-
-```php
-
-// use Illuminate\Foundation\Auth\User as Authenticatable;
-use Malico\LaravelNanoid\Auth\User as Authenticatable;
+    public function nanoidPrefix(): string
+    {
+        return 'pay_'; // pay_2MII83829sl2d
+    }
 
-#class User extends Authenticatable
 ```
 
+Check the upgrade guide if you're [upgrading](UPGRADE.MD) from 0.x
+
 ### Author
 
 Ndifon Desmond Yong
diff --git a/src/Auth/User.php b/src/Auth/User.php
deleted file mode 100644
index f19025f..0000000
--- a/src/Auth/User.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Malico\LaravelNanoid\Auth;
-
-use Illuminate\Foundation\Auth\User as AuthUser;
-use Malico\LaravelNanoid\Eloquent\InteractsWithNanoid;
-
-class User extends AuthUser
-{
-    use InteractsWithNanoid;
-
-    /**
-     * Indicates if the IDs are auto-incrementing.
-     *
-     * @var bool
-     */
-    public $incrementing = false;
-
-    /**
-     * Nano id length.
-     *
-     * @var array|int
-     */
-    protected $nanoidLength;
-
-    /**
-     * Nano id prefix.
-     *
-     * @var string
-     */
-    protected $nanoidPrefix = '';
-
-    /**
-     * The "type" of the auto-incrementing ID.
-     *
-     * @var string
-     */
-    protected $keyType = 'string';
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
-    protected $guarded = [];
-
-    /**
-     * The "booting" method of the model.
-     */
-    protected static function boot(): void
-    {
-        parent::boot();
-
-        static::creating(function (self $model): void {
-            $model->{$model->getKeyName()} = $model->generateNanoid();
-        });
-    }
-}
diff --git a/src/Console/Commands/NanoidModelMakeCommand.php b/src/Console/Commands/NanoidModelMakeCommand.php
index e6a239c..5619428 100644
--- a/src/Console/Commands/NanoidModelMakeCommand.php
+++ b/src/Console/Commands/NanoidModelMakeCommand.php
@@ -33,27 +33,13 @@ class NanoidModelMakeCommand extends ModelMakeCommand
      */
     protected function getStub(): string
     {
-        return realpath(__DIR__.'/../../Eloquent/stubs/nanoid.model.stub');
-    }
-
-    /**
-     * Get the console command options.
-     */
-    protected function getOptions(): array
-    {
-        // Remove the pivot option from the parent class.
-        return array_filter(
-            parent::getOptions(),
-            fn (array $option): bool => $option[0] !== 'pivot'
-        );
+        return realpath(__DIR__.'/stubs/nanoid.model.stub');
     }
 
     /**
      * Create a migration file for the model.
-     *
-     * @return void
      */
-    protected function createMigration()
+    protected function createMigration(): void
     {
         $table = Str::snake(Str::pluralStudly(class_basename($this->argument('name'))));
 
@@ -62,19 +48,4 @@ protected function createMigration()
             '--create' => $table,
         ]);
     }
-
-    /**
-     * Get the value of a command option.
-     *
-     * @param  null|string  $key
-     * @return null|array|bool|string
-     */
-    public function option($key = null)
-    {
-        if ($key === 'pivot') {
-            return false;
-        }
-
-        return parent::option($key);
-    }
 }
diff --git a/src/Database/Migrations/stubs/migration.create.stub b/src/Console/Commands/stubs/migration.create.stub
similarity index 100%
rename from src/Database/Migrations/stubs/migration.create.stub
rename to src/Console/Commands/stubs/migration.create.stub
diff --git a/src/Database/Migrations/stubs/migration.stub b/src/Console/Commands/stubs/migration.stub
similarity index 100%
rename from src/Database/Migrations/stubs/migration.stub
rename to src/Console/Commands/stubs/migration.stub
diff --git a/src/Database/Migrations/stubs/migration.update.stub b/src/Console/Commands/stubs/migration.update.stub
similarity index 100%
rename from src/Database/Migrations/stubs/migration.update.stub
rename to src/Console/Commands/stubs/migration.update.stub
diff --git a/src/Eloquent/stubs/nanoid.model.stub b/src/Console/Commands/stubs/nanoid.model.stub
similarity index 60%
rename from src/Eloquent/stubs/nanoid.model.stub
rename to src/Console/Commands/stubs/nanoid.model.stub
index 3a99299..ae5d75c 100644
--- a/src/Eloquent/stubs/nanoid.model.stub
+++ b/src/Console/Commands/stubs/nanoid.model.stub
@@ -3,9 +3,11 @@
 namespace {{ namespace }};
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Malico\LaravelNanoid\Eloquent\Model;
+use Illuminate\Database\Eloquent\Model;
+use Malico\LaravelNanoid\HasNanoids;
 
 class {{ class }} extends Model
 {
     use HasFactory;
+    use HasNanoids;
 }
diff --git a/src/Database/Migrations/MigrationCreator.php b/src/Database/Migrations/MigrationCreator.php
index ee26af5..61c7033 100644
--- a/src/Database/Migrations/MigrationCreator.php
+++ b/src/Database/Migrations/MigrationCreator.php
@@ -14,6 +14,6 @@ public function __construct(Filesystem $files, $customStubPath = null)
 
     public function stubPath()
     {
-        return __DIR__.'/stubs';
+        return __DIR__.'/../../Console/Commands/stubs';
     }
 }
diff --git a/src/Eloquent/InteractsWithNanoid.php b/src/Eloquent/InteractsWithNanoid.php
deleted file mode 100644
index ca1d4bd..0000000
--- a/src/Eloquent/InteractsWithNanoid.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Malico\LaravelNanoid\Eloquent;
-
-use Hidehalo\Nanoid\Client;
-
-trait InteractsWithNanoid
-{
-    /**
-     * Get the nanoid length.
-     */
-    protected function getNanoidLength(): ?int
-    {
-        if (is_array($this->nanoidLength)) {
-            return random_int($this->nanoidLength[0], $this->nanoidLength[1]);
-        }
-
-        return $this->nanoidLength;
-    }
-
-    /**
-     * Generate a nanoid.
-     */
-    public function generateNanoid(): string
-    {
-        $client = new Client();
-
-        return $this->nanoidPrefix.$client->generateId($this->getNanoidLength(), Client::MODE_DYNAMIC);
-    }
-}
diff --git a/src/Eloquent/Model.php b/src/Eloquent/Model.php
deleted file mode 100644
index 0c6d94b..0000000
--- a/src/Eloquent/Model.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Malico\LaravelNanoid\Eloquent;
-
-use Illuminate\Database\Eloquent\Model as EloquentModel;
-
-abstract class Model extends EloquentModel
-{
-    use InteractsWithNanoid;
-
-    /**
-     * Indicates if the IDs are auto-incrementing.
-     *
-     * @var bool
-     */
-    public $incrementing = false;
-
-    /**
-     * Nano id length.
-     *
-     * @var array|int
-     */
-    protected $nanoidLength;
-
-    /**
-     * Nano id prefix.
-     *
-     * @var string
-     */
-    protected $nanoidPrefix = '';
-
-    /**
-     * The "type" of the auto-incrementing ID.
-     *
-     * @var string
-     */
-    protected $keyType = 'string';
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
-    protected $guarded = [];
-
-    /**
-     * The "booting" method of the model.
-     */
-    protected static function boot(): void
-    {
-        parent::boot();
-
-        static::creating(function (self $model): void {
-            $model->{$model->getKeyName()} = $model->generateNanoid();
-        });
-    }
-}
diff --git a/src/HasNanoids.php b/src/HasNanoids.php
new file mode 100644
index 0000000..00b1003
--- /dev/null
+++ b/src/HasNanoids.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Malico\LaravelNanoid;
+
+use Hidehalo\Nanoid\Client;
+
+trait HasNanoids
+{
+    protected static function bootHasNanoids(): void
+    {
+        static::creating(function (self $model) {
+            $model->{$model->getKeyName()} = $model->generateNanoid();
+        });
+    }
+
+    /**
+     * Generate a nanoid.
+     */
+    protected function generateNanoid(): string
+    {
+        return $this->getNanoIdPrefix().$this->newNanoId();
+    }
+
+    protected function newNanoId(): string
+    {
+        return (new Client())->generateId($this->getNanoidLength(), Client::MODE_DYNAMIC);
+    }
+
+    protected function getNanoIdPrefix(): string
+    {
+        if (property_exists($this, 'nanoidPrefix')) {
+            return $this->nanoidPrefix;
+        }
+
+        if (method_exists($this, 'nanoidPrefix')) {
+            return $this->nanoidPrefix();
+        }
+
+        return '';
+    }
+
+    /**
+     * Get the nanoid length.
+     */
+    protected function getNanoidLength(): ?int
+    {
+        $nanoIdLength = null;
+
+        if (property_exists($this, 'nanoidLength')) {
+            $nanoIdLength = $this->nanoidLength;
+        }
+
+        if (method_exists($this, 'nanoidLength')) {
+            $nanoIdLength = $this->nanoidLength();
+        }
+
+        if (is_array($nanoIdLength)) {
+            return random_int($nanoIdLength[0], $nanoIdLength[1]);
+        }
+
+        return $nanoIdLength;
+    }
+
+    /**
+     * Get the auto-incrementing key type.
+     *
+     * @return string
+     */
+    public function getKeyType()
+    {
+        return 'string';
+    }
+
+    /**
+     * Get the value indicating whether the IDs are incrementing.
+     *
+     * @return bool
+     */
+    public function getIncrementing()
+    {
+        return false;
+    }
+}
diff --git a/tests/Console/Commands/NanoidModelMakeCommandTest.php b/tests/Console/Commands/NanoidModelMakeCommandTest.php
index 4b64ee6..edca806 100644
--- a/tests/Console/Commands/NanoidModelMakeCommandTest.php
+++ b/tests/Console/Commands/NanoidModelMakeCommandTest.php
@@ -15,9 +15,12 @@
 test('it generates a model', function () {
     $this->artisan(NanoidModelMakeCommand::class, ['name' => 'TestModel'])->assertExitCode(0);
 
-    $this->assertFileExists(app_path('Models/TestModel.php'));
-    $this->assertStringContainsString('use Malico\LaravelNanoid\Eloquent\Model;', file_get_contents(app_path('Models/TestModel.php')));
-    $this->assertStringContainsString('extends Model', file_get_contents(app_path('Models/TestModel.php')));
+    $modelContent = file_get_contents(app_path('Models/TestModel.php'));
+
+    $this->assertStringContainsString('use Malico\LaravelNanoid\HasNanoids', $modelContent);
+    $this->assertStringContainsString('extends Model', $modelContent);
+    $this->assertStringContainsString('use HasNanoids;', $modelContent);
+
 });
 
 test('it generates a migration if specified', function () {
diff --git a/tests/Eloquent/ModelTest.php b/tests/Eloquent/ModelTest.php
deleted file mode 100644
index 59fbf40..0000000
--- a/tests/Eloquent/ModelTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-use Illuminate\Support\Str;
-use Malico\LaravelNanoid\Auth\User;
-use Malico\LaravelNanoid\Eloquent\Model;
-
-abstract class ModelTest extends Model
-{
-    protected $table = 'test_migrations_with_string_id';
-}
-
-class UserModel extends User
-{
-    protected $table = 'test_migrations_with_string_id';
-}
-
-class BasicModel extends ModelTest
-{
-}
-
-class BasicModelWithPrefix extends ModelTest
-{
-    protected $nanoidPrefix = 'pl_';
-}
-
-class BasicModelWithLength extends ModelTest
-{
-    protected $nanoidLength = 3;
-}
-
-test('creates nanoid before saving', function () {
-    $model = BasicModel::create();
-
-    expect($model->getKey())->toBeString();
-});
-
-test('creates nanoid with prefix before saving', function () {
-    $model = BasicModelWithPrefix::create();
-
-    expect(Str::is('pl_*', $model->getKey()))->toBeTrue();
-});
-
-test('creates nanoid with length before saving', function () {
-    $model = BasicModelWithLength::create();
-
-    expect(Str::length($model->getKey()))->toBe(3);
-});
-
-test('user model creates with appropriate id', function () {
-    $model = UserModel::create();
-
-    expect($model->getKey())->toBeString();
-});
diff --git a/tests/HasNanoidsTest.php b/tests/HasNanoidsTest.php
new file mode 100644
index 0000000..8337f59
--- /dev/null
+++ b/tests/HasNanoidsTest.php
@@ -0,0 +1,113 @@
+<?php
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Str;
+use Malico\LaravelNanoid\HasNanoids;
+
+it('creates nanoid before saving', function () {
+    $model = BasicModel::create();
+
+    expect($model->getKey())->toBeString();
+});
+
+it('creates nanoid with prefix before saving', function () {
+    $model = BasicModelWithPrefix::create();
+
+    expect(Str::is('pl_*', $model->getKey()))->toBeTrue();
+});
+
+it('creates nanoid with length before saving', function () {
+    $model = BasicModelWithLength::create();
+
+    expect(Str::length($model->getKey()))->toBe(3);
+});
+
+it('creates nanoid with length array before saving', function () {
+    $model = BasicModelWithLengthArray::create();
+
+    expect(Str::length($model->getKey()))->toBeGreaterThanOrEqual(3);
+    expect(Str::length($model->getKey()))->toBeLessThanOrEqual(5);
+});
+
+it('creates nanoid with prefix and length before saving', function () {
+    $model = BasicModelWithPrefixAndLength::create();
+
+    expect(Str::is('pl_*', $model->getKey()))->toBeTrue();
+    expect(Str::length($model->getKey()))->toBe(6); // 3 + 3
+});
+
+it('creates nanoid with prefix and length array before saving', function () {
+    $model = BasicModelWithPrefixAndLengthArray::create();
+
+    expect(Str::is('pl_*', $model->getKey()))->toBeTrue();
+    expect(Str::length($model->getKey()))->toBeGreaterThanOrEqual(6); // 3 + 3
+    expect(Str::length($model->getKey()))->toBeLessThanOrEqual(8); // 3 + 5
+});
+
+it('creates nanoid with prefix method before saving', function () {
+    $model = BasicModelWithPrefixMethod::create();
+
+    expect(Str::is('pl_*', $model->getKey()))->toBeTrue();
+});
+
+it('creates nanoid with length method before saving', function () {
+    $model = BasicModelWithLengthMethod::create();
+
+    expect(Str::length($model->getKey()))->toBe(3);
+});
+
+abstract class ModelTest extends Model
+{
+    use HasNanoids;
+
+    protected $table = 'test_migrations_with_string_id';
+}
+
+class BasicModel extends ModelTest
+{
+}
+
+class BasicModelWithPrefix extends ModelTest
+{
+    protected $nanoidPrefix = 'pl_';
+}
+
+class BasicModelWithLength extends ModelTest
+{
+    protected $nanoidLength = 3;
+}
+
+class BasicModelWithLengthArray extends ModelTest
+{
+    protected $nanoidLength = [3, 5];
+}
+
+class BasicModelWithPrefixAndLength extends ModelTest
+{
+    protected $nanoidPrefix = 'pl_';
+
+    protected $nanoidLength = 3;
+}
+
+class BasicModelWithPrefixAndLengthArray extends ModelTest
+{
+    protected $nanoidPrefix = 'pl_';
+
+    protected $nanoidLength = [3, 5];
+}
+
+class BasicModelWithPrefixMethod extends ModelTest
+{
+    public function nanoidPrefix(): string
+    {
+        return 'pl_';
+    }
+}
+
+class BasicModelWithLengthMethod extends ModelTest
+{
+    public function nanoidLength(): int
+    {
+        return 3;
+    }
+}