diff --git a/src/events/gameMaster/assetManager/object/upload.ts b/src/events/gameMaster/assetManager/object/upload.ts
index 70f40eb..cd5a8e4 100644
--- a/src/events/gameMaster/assetManager/object/upload.ts
+++ b/src/events/gameMaster/assetManager/object/upload.ts
@@ -4,20 +4,26 @@ import { writeFile } from 'node:fs/promises'
 import path from 'path'
 import fs from 'fs/promises'
 import prisma from '../../../../utilities/prisma'
+import sharp from 'sharp'
+import logger from '../../../../utilities/logger'
 
 interface IObjectData {
   [key: string]: Buffer
 }
 
-/**
- * Handle game master upload object event
- * @param socket
- * @param io
- */
-export default function (socket: TSocket, io: Server) {
-  socket.on('gm:object:upload', async (data: IObjectData, callback: (response: boolean) => void) => {
+export default class ObjectUploadEvent {
+  constructor(
+    private readonly io: Server,
+    private readonly socket: TSocket
+  ) {}
+
+  public listen(): void {
+    this.socket.on('gm:object:upload', this.handleObjectUpload.bind(this))
+  }
+
+  private async handleObjectUpload(data: IObjectData, callback: (response: boolean) => void): Promise<void> {
     try {
-      if (socket.character?.role !== 'gm') {
+      if (this.socket.character?.role !== 'gm') {
         callback(false)
         return
       }
@@ -28,12 +34,19 @@ export default function (socket: TSocket, io: Server) {
       await fs.mkdir(public_folder, { recursive: true })
 
       const uploadPromises = Object.entries(data).map(async ([key, objectData]) => {
+        // Get image dimensions
+        const metadata = await sharp(objectData).metadata()
+        const width = metadata.width || 0
+        const height = metadata.height || 0
+
         const object = await prisma.object.create({
           data: {
             name: key,
             tags: [],
             originX: 0,
-            originY: 0
+            originY: 0,
+            frameWidth: width,
+            frameHeight: height,
           }
         })
 
@@ -41,14 +54,16 @@ export default function (socket: TSocket, io: Server) {
         const filename = `${uuid}.png`
         const finalFilePath = path.join(public_folder, filename)
         await writeFile(finalFilePath, objectData)
+
+        logger.info('gm:object:upload', `Object ${key} uploaded with id ${uuid}`)
       })
 
       await Promise.all(uploadPromises)
 
       callback(true)
-    } catch (error) {
-      console.error('Error uploading tile:', error)
+    } catch (error: any) {
+      logger.error('gm:object:upload error', error.message)
       callback(false)
     }
-  })
-}
+  }
+}
\ No newline at end of file