diff --git a/fyle_accounting_mappings/migrations/0028_auto_20241226_1030.py b/fyle_accounting_mappings/migrations/0028_auto_20241226_1030.py
new file mode 100644
index 0000000..e5349d4
--- /dev/null
+++ b/fyle_accounting_mappings/migrations/0028_auto_20241226_1030.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.14 on 2024-12-26 10:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fyle_accounting_mappings', '0027_alter_employeemapping_source_employee'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mappingsetting',
+            name='created_by',
+            field=models.CharField(blank=True, help_text='Email of the user who created this record', max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='mappingsetting',
+            name='updated_by',
+            field=models.CharField(blank=True, help_text='Email of the user who last updated this record', max_length=255, null=True),
+        ),
+    ]
diff --git a/fyle_accounting_mappings/models.py b/fyle_accounting_mappings/models.py
index da5c23a..6e4a28f 100644
--- a/fyle_accounting_mappings/models.py
+++ b/fyle_accounting_mappings/models.py
@@ -9,6 +9,7 @@
 from .exceptions import BulkError
 from .utils import assert_valid
 
+from .mixins import AutoAddCreateUpdateInfoMixin
 
 workspace_models = importlib.import_module("apps.workspaces.models")
 Workspace = workspace_models.Workspace
@@ -518,7 +519,7 @@ def create_or_update_expense_fields(attributes: List[Dict], fields_included: Lis
         return expense_fields
 
 
-class MappingSetting(models.Model):
+class MappingSetting(AutoAddCreateUpdateInfoMixin, models.Model):
     """
     Mapping Settings
     """
diff --git a/setup.py b/setup.py
index eb94159..601a42a 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 
 setuptools.setup(
     name='fyle-accounting-mappings',
-    version='1.36.1',
+    version='1.36.2',
     author='Shwetabh Kumar',
     author_email='shwetabh.kumar@fyle.in',
     description='Django application to store the fyle accounting mappings in a generic manner',