diff --git a/addon/adapters/warehouse-dock.js b/addon/adapters/warehouse-dock.js
new file mode 100644
index 00000000..5728057c
--- /dev/null
+++ b/addon/adapters/warehouse-dock.js
@@ -0,0 +1 @@
+export { default } from './pallet';
diff --git a/addon/components/cell/product-info.js b/addon/components/cell/product-info.js
index d44a6d64..d593958b 100644
--- a/addon/components/cell/product-info.js
+++ b/addon/components/cell/product-info.js
@@ -2,14 +2,14 @@ import Component from '@glimmer/component';
 import { action, computed, get } from '@ember/object';
 
 export default class CellProductInfoComponent extends Component {
-    @computed('args.row', 'args.column.{modelPath}') get product() {
+    @computed('args.row', 'args.column.modelPath') get product() {
         const { column, row } = this.args;
 
         if (typeof column?.modelPath === 'string') {
             return get(row, column.modelPath);
         }
 
-        return row
+        return row;
     }
 
     @action onClick(event) {
diff --git a/addon/components/inventory-form-panel.hbs b/addon/components/inventory-form-panel.hbs
index c7cc5f3e..efe0434a 100644
--- a/addon/components/inventory-form-panel.hbs
+++ b/addon/components/inventory-form-panel.hbs
@@ -96,9 +96,6 @@
                 </InputGroup>
                 <InputGroup @name="Batch Quantity" @type="number" @value={{this.inventory.batch.quantity}} />
                 <InputGroup @name="Batch Number" @type="number" @value={{this.inventory.batch.batch_number}} />
-                <InputGroup @name="Batch Reason">
-                    <Textarea @value={{this.inventory.batch.reason}} aria-label="Reason" class="w-full form-input" placeholder="Reason" rows={{5}} />
-                </InputGroup>
             </ContentPanel>
         </div>
     </Overlay::Body>
diff --git a/addon/components/warehouse-editor.hbs b/addon/components/warehouse-editor.hbs
index aecc44a2..5c0223dd 100644
--- a/addon/components/warehouse-editor.hbs
+++ b/addon/components/warehouse-editor.hbs
@@ -79,4 +79,62 @@
             {{/each}}
         {{/each}}
     </div>
+    <div class="content-panel mb-2">
+        <div class="content-panel-header items-center">
+            <h3 class="text-lg font-semibold dark:text-gray-100">
+                Docks
+            </h3>
+            <Button @text="Add Dock" @icon="plus" @iconPrefix="fas" @onClick={{this.addDock}} />
+        </div>
+        <div class="content-panel-body">
+            {{#each this.warehouse.docks as |dock|}}
+                <div class="flex flex-row items-center px-4 py-2 border border-gray-700 rounded-md">
+                    <div class="flex flex-row items-center justify-end">
+                        <Button @icon="trash" @type="danger" @onClick={{fn this.removeDock dock}} />
+                    </div>
+                    <div class="p-3">
+                        <div class="grid grid-cols-3 gap-2">
+                            <InputGroup @name="Dock Number" @wrapperClass="col-span-2">
+                                <Input @value={{dock.dock_number}} @type="text" class="w-full form-input" placeholder="Dock Number" />
+                            </InputGroup>
+                            <InputGroup @name="Direction" @wrapperClass="col-span-2">
+                                <Input @value={{dock.direction}} @type="text" class="w-full form-input" placeholder="Direction" />
+                            </InputGroup>
+                            <InputGroup @name="Capacity" @wrapperClass="col-span-2">
+                                <Input @value={{dock.capacity}} @type="text" class="w-full form-input" placeholder="Capacity" />
+                            </InputGroup>
+                            <InputGroup @name="Status">
+                                <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
+                                    <PowerSelect
+                                        @options={{dock.statusOptions}}
+                                        @selected={{dock.status}}
+                                        @onChange={{fn (mut dock.status)}}
+                                        @placeholder="Select dock status"
+                                        @triggerClass="form-select form-input"
+                                        as |status|
+                                    >
+                                        {{smart-humanize status}}
+                                    </PowerSelect>
+                                </div>
+                            </InputGroup>
+                            <InputGroup @name="Type">
+                                <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
+                                    <PowerSelect
+                                        @options={{dock.typeOptions}}
+                                        @selected={{dock.type}}
+                                        @onChange={{fn (mut dock.type)}}
+                                        @placeholder="Select dock type"
+                                        @triggerClass="form-select form-input"
+                                        as |type|
+                                    >
+                                        {{smart-humanize type}}
+                                    </PowerSelect>
+                                </div>
+                            </InputGroup>
+                        </div>
+                    </div>
+                </div>
+            {{/each}}
+        </div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/addon/components/warehouse-editor.js b/addon/components/warehouse-editor.js
index c2c1141b..7d07082c 100644
--- a/addon/components/warehouse-editor.js
+++ b/addon/components/warehouse-editor.js
@@ -58,6 +58,15 @@ export default class WarehouseEditorComponent extends Component {
         rack.bins.pushObject(bin);
     }
 
+    @action addDock() {
+        const dock = this.store.createRecord('warehouse-dock', { warehouse_uuid: this.warehouse.id });
+        this.warehouse.docks.pushObject(dock);
+    }
+
+    @action removeDock(dock) {
+        dock.destroyRecord();
+    }
+
     @action removeSection(section) {
         section.destroyRecord();
     }
diff --git a/addon/controllers/inventory/index/new.js b/addon/controllers/inventory/index/new.js
index 6d5e4daf..8e817c9d 100644
--- a/addon/controllers/inventory/index/new.js
+++ b/addon/controllers/inventory/index/new.js
@@ -40,7 +40,6 @@ export default class InventoryIndexNewController extends Controller {
     @tracked inventory = this.store.createRecord('inventory', {
         type: 'pallet-inventory',
         meta: {},
-        batches: [this.store.createRecord('batch')],
     });
 
     /**
@@ -90,7 +89,6 @@ export default class InventoryIndexNewController extends Controller {
         this.inventory = this.store.createRecord('inventory', {
             type: 'pallet-inventory',
             meta: {},
-            batches: [this.store.createRecord('batch')],
         });
     }
 }
diff --git a/addon/controllers/warehouses/index.js b/addon/controllers/warehouses/index.js
index e474bf6c..41cb667a 100644
--- a/addon/controllers/warehouses/index.js
+++ b/addon/controllers/warehouses/index.js
@@ -131,7 +131,7 @@ export default class WarehousesIndexController extends Controller {
      * @var {String}
      */
     @tracked neighborhood;
-    
+
     @tracked warehouse;
 
     /**
diff --git a/addon/controllers/warehouses/index/new.js b/addon/controllers/warehouses/index/new.js
index f819e067..47d4d8b3 100644
--- a/addon/controllers/warehouses/index/new.js
+++ b/addon/controllers/warehouses/index/new.js
@@ -43,14 +43,10 @@ export default class WarehousesIndexNewController extends Controller {
         meta: {},
         sections: [
             this.store.createRecord('warehouse-section', {
-                aisles: [
-                    this.store.createRecord('warehouse-aisle', 
-                    { racks: [
-                        this.store.createRecord('warehouse-rack', 
-                        { bins: [this.store.createRecord('warehouse-bin')]})] 
-                    })],
+                aisles: [this.store.createRecord('warehouse-aisle', { racks: [this.store.createRecord('warehouse-rack', { bins: [this.store.createRecord('warehouse-bin')] })] })],
             }),
         ],
+        docks: [this.store.createRecord('warehouse-dock')],
     });
 
     /**
@@ -103,9 +99,10 @@ export default class WarehousesIndexNewController extends Controller {
             meta: {},
             sections: [
                 this.store.createRecord('warehouse-section', {
-                    aisles: [this.store.createRecord('warehouse-aisle', { racks: [this.store.createRecord('warehouse-rack', {bins: [this.store.createRecord('warehouse-bin')]})] })],
+                    aisles: [this.store.createRecord('warehouse-aisle', { racks: [this.store.createRecord('warehouse-rack', { bins: [this.store.createRecord('warehouse-bin')] })] })],
                 }),
             ],
+            docks: [this.store.createRecord('warehouse-dock')],
         });
     }
 }
diff --git a/addon/models/batch.js b/addon/models/batch.js
index cb6cbea8..4c45cb2b 100644
--- a/addon/models/batch.js
+++ b/addon/models/batch.js
@@ -22,6 +22,7 @@ export default class BatchModel extends Model {
     @attr('date') expiry_date_at;
     @attr('date') created_at;
     @attr('date') updated_at;
+    @attr('raw') meta;
 
     /** @computed */
     @computed('created_at') get createdAgo() {
diff --git a/addon/models/inventory.js b/addon/models/inventory.js
index 46c4b6f4..37bdea53 100644
--- a/addon/models/inventory.js
+++ b/addon/models/inventory.js
@@ -26,6 +26,7 @@ export default class InventoryModel extends Model {
     @attr('number') quantity;
     @attr('number') min_quantity;
     @attr('number') status;
+    @attr('raw') meta;
 
     /** @date */
     @attr('date') created_at;
diff --git a/addon/models/warehouse.js b/addon/models/warehouse.js
index 9049e642..6340782f 100644
--- a/addon/models/warehouse.js
+++ b/addon/models/warehouse.js
@@ -3,4 +3,5 @@ import { hasMany } from '@ember-data/model';
 
 export default class WarehouseModel extends PlaceModel {
     @hasMany('warehouse-section') sections;
+    @hasMany('warehouse-dock') docks;
 }
diff --git a/addon/routes/inventory/index.js b/addon/routes/inventory/index.js
index fc3e01dc..96971b64 100644
--- a/addon/routes/inventory/index.js
+++ b/addon/routes/inventory/index.js
@@ -15,6 +15,6 @@ export default class InventoryIndexRoute extends Route {
     };
 
     model(params) {
-        return this.store.query('inventory', { ...params, with: ['product', 'warehouse', 'batch'] });
+        return this.store.query('inventory', { ...params, with: ['product', 'warehouse'] });
     }
 }
diff --git a/addon/routes/warehouses/index.js b/addon/routes/warehouses/index.js
index 6225f229..859d0691 100644
--- a/addon/routes/warehouses/index.js
+++ b/addon/routes/warehouses/index.js
@@ -23,6 +23,6 @@ export default class WarehousesIndexRoute extends Route {
     };
 
     model(params) {
-        return this.store.query('warehouse', { ...params, with: ['sections', 'sections.aisles', 'sections.aisles.racks', 'sections.aisles.racks.bins'] });
+        return this.store.query('warehouse', { ...params, with: ['sections', 'sections.aisles', 'sections.aisles.racks', 'sections.aisles.racks.bins', 'docks'] });
     }
 }
diff --git a/addon/serializers/warehouse-dock.js b/addon/serializers/warehouse-dock.js
new file mode 100644
index 00000000..1380ab41
--- /dev/null
+++ b/addon/serializers/warehouse-dock.js
@@ -0,0 +1,4 @@
+import ApplicationSerializer from '@fleetbase/ember-core/serializers/application';
+import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
+
+export default class WarehouseDockSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {}
diff --git a/addon/serializers/warehouse.js b/addon/serializers/warehouse.js
index 2db429a2..3fef11b8 100644
--- a/addon/serializers/warehouse.js
+++ b/addon/serializers/warehouse.js
@@ -10,6 +10,7 @@ export default class WarehouseSerializer extends ApplicationSerializer.extend(Em
     get attrs() {
         return {
             sections: { embedded: 'always' },
+            docks: { embedded: 'always' },
         };
     }
 }
diff --git a/app/adapters/warehouse-dock.js b/app/adapters/warehouse-dock.js
new file mode 100644
index 00000000..a476a21e
--- /dev/null
+++ b/app/adapters/warehouse-dock.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/pallet-engine/adapters/warehouse-dock';
diff --git a/app/serializers/warehouse-dock.js b/app/serializers/warehouse-dock.js
new file mode 100644
index 00000000..d6dca567
--- /dev/null
+++ b/app/serializers/warehouse-dock.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/pallet-engine/serializers/warehouse-dock';
diff --git a/server/src/Http/Controllers/InventoryController.php b/server/src/Http/Controllers/InventoryController.php
index 6a6b2ac3..6bfe5e0f 100644
--- a/server/src/Http/Controllers/InventoryController.php
+++ b/server/src/Http/Controllers/InventoryController.php
@@ -28,27 +28,4 @@ public function queryRecord(Request $request)
 
         return IndexInventory::collection($data);
     }
-
-    public function createRecord(Request $request)
-    {
-        try {
-            $this->validateRequest($request);
-            $record = $this->model->createRecordFromRequest($request, null, function ($request, $inventory) {
-                $batch = $request->array('inventory.batch', []);
-                Batch::create(['uuid' => data_get($batch, 'uuid')], array_merge($batch, ['batch_number' =>('batch_number') ,'company_uuid' => session('company'), 'created_by_uuid' => session('user')]));
-            });
-            if (Http::isInternalRequest($request)) {
-                $this->resource::wrap($this->resourceSingularlName);
-
-                return new $this->resource($record);
-            }
-            return new $this->resource($record);
-        } catch (\Exception $e) {
-            return response()->error($e->getMessage());
-        } catch (QueryException $e) {
-            return response()->error($e->getMessage());
-        } catch (FleetbaseRequestValidationException $e) {
-            return response()->error($e->getErrors());
-        }
-    }
 }
diff --git a/server/src/Http/Controllers/WarehouseController.php b/server/src/Http/Controllers/WarehouseController.php
index a8dc8ba4..50fbfd79 100644
--- a/server/src/Http/Controllers/WarehouseController.php
+++ b/server/src/Http/Controllers/WarehouseController.php
@@ -7,6 +7,7 @@
 use Fleetbase\Pallet\Models\WarehouseAisle;
 use Fleetbase\Pallet\Models\WarehouseBin;
 use Fleetbase\Pallet\Models\WarehouseRack;
+use Fleetbase\Pallet\Models\WarehouseDock;
 use Fleetbase\Support\Http;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
@@ -25,8 +26,17 @@ public function createRecord(Request $request)
         try {
             $this->validateRequest($request);
             $record = $this->model->createRecordFromRequest($request, null, function ($request, $warehouse) {
-                $sections = $request->array('warehouse.sections', []);
 
+                $docks = $request->array('warehouse.docks', []);
+                foreach($docks as $dock) {
+                    WarehouseDock::create((array_merge($dock, [
+                        'warehouse_uuid' => data_get($warehouse, 'uuid'),
+                        'company_uuid' => session('company'),
+                        'created_by_uuid' => session('user')
+                    ])));
+                }
+
+                $sections = $request->array('warehouse.sections', []);
                 foreach ($sections as $section) {
                     $createdSection = WarehouseSection::create(array_merge($section, [
                         'warehouse_uuid' => data_get($warehouse, 'uuid'),
@@ -83,8 +93,12 @@ public function updateRecord(Request $request, string $id)
         try {
             $this->validateRequest($request);
             $record = $this->model->updateRecordFromRequest($request, $id, null, function ($request, $warehouse) {
-                $sections = $request->array('warehouse.sections', []);
+                $docks = $request->array('warehouse.docks', []);
+                foreach($docks as $dock) {
+                    WarehouseDock::updateOrCreate(['uuid' => data_get($dock, 'uuid')], array_merge($dock, ['warehouse_uuid' => $warehouse->uuid, 'company_uuid' => session('company'), 'created_by_uuid' => session('user')]));
+                }
 
+                $sections = $request->array('warehouse.sections', []);
                 foreach ($sections as $section) {
                     WarehouseSection::updateOrCreate(['uuid' => data_get($section, 'uuid')], array_merge($section, ['warehouse_uuid' => $warehouse->uuid, 'company_uuid' => session('company'), 'created_by_uuid' => session('user')]));
 
diff --git a/server/src/Http/Controllers/WarehouseDockController.php b/server/src/Http/Controllers/WarehouseDockController.php
new file mode 100644
index 00000000..5d2bd4d5
--- /dev/null
+++ b/server/src/Http/Controllers/WarehouseDockController.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Fleetbase\Pallet\Http\Controllers;
+
+class WarehouseSectionController extends PalletResourceController
+{
+    /**
+     * The resource to query.
+     *
+     * @var string
+     */
+    public $resource = 'warehouse-dock';
+}
diff --git a/server/src/Http/Resources/IndexInventory.php b/server/src/Http/Resources/IndexInventory.php
index 5f323b0f..8544b52d 100644
--- a/server/src/Http/Resources/IndexInventory.php
+++ b/server/src/Http/Resources/IndexInventory.php
@@ -21,6 +21,7 @@ public function toArray($request)
             'product_uuid' => $this->product_uuid,
             'product'      => $this->whenLoaded('product', $this->product),
             'batch'        => $this->whenLoaded('batch', $this->batch),
+            'batch_uuid'   => $this->batch_uuid,
             'quantity'     => (int) $this->total_quantity,
             'comments'     => $this->latest_comments,
             'updated_at'   => $this->latest_updated_at,
diff --git a/server/src/Http/Resources/WarehouesDock.php b/server/src/Http/Resources/WarehouesDock.php
new file mode 100644
index 00000000..94ad2e4e
--- /dev/null
+++ b/server/src/Http/Resources/WarehouesDock.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Fleetbase\Pallet\Http\Resources;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+class WarehouseDock extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
+     */
+    public function toArray($request)
+    {
+        return [
+            'id'                   => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                 => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'            => $this->when(Http::isInternalRequest(), $this->public_id),
+            'updated_at'           => $this->updated_at,
+            'created_at'           => $this->created_at,
+        ];
+    }
+}
diff --git a/server/src/Http/Resources/Warehouse.php b/server/src/Http/Resources/Warehouse.php
index faba6931..27cbb05d 100644
--- a/server/src/Http/Resources/Warehouse.php
+++ b/server/src/Http/Resources/Warehouse.php
@@ -43,6 +43,7 @@ public function toArray($request)
             'type'                 => data_get($this, 'type'),
             'meta'                 => data_get($this, 'meta', []),
             'sections'             => $this->whenLoaded('sections', $this->sections),
+            'docks'                => $this->whenLoaded('docks', $this->docks),
             'updated_at'           => $this->updated_at,
             'created_at'           => $this->created_at,
         ];
diff --git a/server/src/Models/Batch.php b/server/src/Models/Batch.php
index f3b40b4b..60dcbb5b 100644
--- a/server/src/Models/Batch.php
+++ b/server/src/Models/Batch.php
@@ -60,7 +60,9 @@ class Batch extends Model
      *
      * @var array
      */
-    protected $casts = [];
+    protected $casts = [
+        'meta' => 'json',
+    ];
 
     /**
      * Dynamic attributes that are appended to object.
diff --git a/server/src/Models/Inventory.php b/server/src/Models/Inventory.php
index 23184886..8b8ae0d3 100644
--- a/server/src/Models/Inventory.php
+++ b/server/src/Models/Inventory.php
@@ -60,7 +60,9 @@ class Inventory extends Model
      *
      * @var array
      */
-    protected $casts = [];
+    protected $casts = [
+        'meta' => 'json',
+    ];
 
     /**
      * Dynamic attributes that are appended to object.
@@ -80,6 +82,8 @@ class Inventory extends Model
 
     protected $filterParams = ['supplier_uuid', 'comments','expiry_date_at', 'status', 'company', 'createdBy', 'supplier'];
 
+    
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
diff --git a/server/src/Models/Warehouse.php b/server/src/Models/Warehouse.php
index f0a56096..0b972baa 100644
--- a/server/src/Models/Warehouse.php
+++ b/server/src/Models/Warehouse.php
@@ -29,4 +29,9 @@ public function sections()
     {
         return $this->hasMany(WarehouseSection::class, 'warehouse_uuid');
     }
+
+    public function docks()
+    {
+        return $this->hasMany(WarehouseDock::class, 'warehouse_uuid');
+    }
 }
diff --git a/server/src/Models/WarehouseDock.php b/server/src/Models/WarehouseDock.php
index 7fc58c3d..f4e0f4a4 100644
--- a/server/src/Models/WarehouseDock.php
+++ b/server/src/Models/WarehouseDock.php
@@ -5,13 +5,10 @@
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasUuid;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
 class WarehouseDock extends Model
 {
     use HasUuid;
     use HasApiModelBehavior;
-    use SoftDeletes;
 
     /**
      * The database table used by the model.
@@ -27,6 +24,20 @@ class WarehouseDock extends Model
      */
     protected $singularName = 'warehouse_dock';
 
+    /**
+     * Overwrite both place resource name with `payloadKey`.
+     *
+     * @var string
+     */
+    protected $payloadKey = 'warehouse_dock';
+
+    /**
+     * The type of public Id to generate.
+     *
+     * @var string
+     */
+    protected $publicIdType = 'warehouse_dock';
+
     /**
      * These attributes that can be queried.
      *
diff --git a/tests/unit/adapters/warehouse-dock-test.js b/tests/unit/adapters/warehouse-dock-test.js
new file mode 100644
index 00000000..797113ed
--- /dev/null
+++ b/tests/unit/adapters/warehouse-dock-test.js
@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'dummy/tests/helpers';
+
+module('Unit | Adapter | warehouse dock', function (hooks) {
+    setupTest(hooks);
+
+    // Replace this with your real tests.
+    test('it exists', function (assert) {
+        let adapter = this.owner.lookup('adapter:warehouse-dock');
+        assert.ok(adapter);
+    });
+});
diff --git a/tests/unit/serializers/warehouse-dock-test.js b/tests/unit/serializers/warehouse-dock-test.js
new file mode 100644
index 00000000..73d9ae85
--- /dev/null
+++ b/tests/unit/serializers/warehouse-dock-test.js
@@ -0,0 +1,23 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'dummy/tests/helpers';
+
+module('Unit | Serializer | warehouse dock', function (hooks) {
+    setupTest(hooks);
+
+    // Replace this with your real tests.
+    test('it exists', function (assert) {
+        let store = this.owner.lookup('service:store');
+        let serializer = store.serializerFor('warehouse-dock');
+
+        assert.ok(serializer);
+    });
+
+    test('it serializes records', function (assert) {
+        let store = this.owner.lookup('service:store');
+        let record = store.createRecord('warehouse-dock', {});
+
+        let serializedRecord = record.serialize();
+
+        assert.ok(serializedRecord);
+    });
+});