diff --git a/packages/forest_admin_datasource_toolkit/lib/forest_admin_datasource_toolkit/components/caller.rb b/packages/forest_admin_datasource_toolkit/lib/forest_admin_datasource_toolkit/components/caller.rb
index 59be1e34d..183e6b5ea 100644
--- a/packages/forest_admin_datasource_toolkit/lib/forest_admin_datasource_toolkit/components/caller.rb
+++ b/packages/forest_admin_datasource_toolkit/lib/forest_admin_datasource_toolkit/components/caller.rb
@@ -16,7 +16,8 @@ def initialize(
         role: nil,
         request: {},
         project: nil,
-        environment: nil
+        environment: nil,
+        **_extra_args
       )
         @id = id
         @email = email
diff --git a/packages/forest_admin_datasource_toolkit/spec/lib/forest_admin_datasource_toolkit/components/caller_spec.rb b/packages/forest_admin_datasource_toolkit/spec/lib/forest_admin_datasource_toolkit/components/caller_spec.rb
new file mode 100644
index 000000000..e5b222ee0
--- /dev/null
+++ b/packages/forest_admin_datasource_toolkit/spec/lib/forest_admin_datasource_toolkit/components/caller_spec.rb
@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+module ForestAdminDatasourceToolkit
+  module Components
+    describe Caller do
+      let(:valid_params) do
+        {
+          id: 1,
+          email: 'test@example.com',
+          first_name: 'John',
+          last_name: 'Doe',
+          team: 'Engineering',
+          rendering_id: 123,
+          tags: ['tag1', 'tag2'],
+          timezone: 'Europe/Paris',
+          permission_level: 'admin'
+        }
+      end
+
+      describe '#initialize' do
+        it 'creates a caller with standard parameters' do
+          caller = described_class.new(**valid_params)
+
+          expect(caller.id).to eq(1)
+          expect(caller.email).to eq('test@example.com')
+          expect(caller.first_name).to eq('John')
+          expect(caller.last_name).to eq('Doe')
+          expect(caller.team).to eq('Engineering')
+          expect(caller.rendering_id).to eq(123)
+          expect(caller.tags).to eq(['tag1', 'tag2'])
+          expect(caller.timezone).to eq('Europe/Paris')
+          expect(caller.permission_level).to eq('admin')
+        end
+
+        it 'accepts extra arguments without raising an error' do
+          params_with_extra = valid_params.merge(
+            extra_field1: 'value1',
+            extra_field2: 'value2',
+            custom_data: { key: 'value' }
+          )
+
+          expect { described_class.new(**params_with_extra) }.not_to raise_error
+        end
+
+        it 'creates a valid caller when extra arguments are provided' do
+          params_with_extra = valid_params.merge(
+            unknown_field: 'some_value',
+            another_field: 123
+          )
+
+          caller = described_class.new(**params_with_extra)
+
+          expect(caller.id).to eq(1)
+          expect(caller.email).to eq('test@example.com')
+        end
+      end
+
+      describe '#to_h' do
+        it 'returns a hash with all instance variables' do
+          caller = described_class.new(**valid_params)
+          hash = caller.to_h
+
+          expect(hash[:id]).to eq(1)
+          expect(hash[:email]).to eq('test@example.com')
+          expect(hash[:first_name]).to eq('John')
+          expect(hash[:last_name]).to eq('Doe')
+          expect(hash[:team]).to eq('Engineering')
+          expect(hash[:rendering_id]).to eq(123)
+          expect(hash[:tags]).to eq(['tag1', 'tag2'])
+          expect(hash[:timezone]).to eq('Europe/Paris')
+        end
+      end
+    end
+  end
+end