diff --git a/specs/contacts.openapi.yml b/specs/contacts.openapi.yml
index ba608b6..4be4b0f 100644
--- a/specs/contacts.openapi.yml
+++ b/specs/contacts.openapi.yml
@@ -209,7 +209,8 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
-            import io.mailtrap.model.request.contact.CreateContactRequest;
+            import io.mailtrap.model.request.contacts.CreateContactRequest;
+            import java.util.HashMap;
 
             var config = new MailtrapConfig.Builder()
                 .token("YOUR_API_TOKEN")
@@ -516,10 +517,13 @@ paths:
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
             import io.mailtrap.model.request.contacts.*;
+            import java.util.Map;
+            
             MailtrapConfig config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
+            
             var request = new UpdateContactRequest(new UpdateContact("new@example.com", Map.of("first_name", "John"), List.of(), List.of(), false));
-            var response = client.contactsApi().contacts().updateContact(12345L, "contact_id_or_email", request);
+            var response = client.contactsApi().contacts().updateContact(accountId, "contact_id_or_email", request);
       summary: Update contact
       tags:
         - Contacts
@@ -621,9 +625,11 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             MailtrapConfig config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            client.contactsApi().contacts().deleteContact(12345L, "contact_id_or_email");
+            
+            client.contactsApi().contacts().deleteContact(accountId, "contact_id_or_email");
       summary: Delete contact
       tags:
         - Contacts
@@ -711,10 +717,15 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            import io.mailtrap.model.request.contactevents.CreateContactEventRequest;
+            import java.util.Map;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var params = Map.of("user_id", 101, "is_active", true);
-            var response = client.contactsApi().contacts().createEvent(accountId, "contact_id", "UserLogin", params);
+            
+            Map<String, Object> params = Map.of("user_id", 101, "is_active", true);
+            var request = new CreateContactEventRequest("UserLogin", params);
+            var response = client.contactsApi().contactEvents().createContactEvent(accountId, "contact_id", request);
       requestBody:
         content:
           application/json:
@@ -818,10 +829,17 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            import io.mailtrap.model.request.contactexports.ContactExportFilter;
+            import io.mailtrap.model.request.contactexports.ContactExportFilterOperator;
+            import io.mailtrap.model.request.contactexports.CreateContactsExportRequest;
+            import java.util.List;
+
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var filters = List.of(Map.of("name", "list_id", "operator", "equal", "value", List.of(1, 2)));
-            var response = client.contactsApi().exports().create(accountId, filters);
+            
+            var idsFilter = ContactExportFilter.listIds(ContactExportFilterOperator.EQUAL, 1L, 2L);
+            var request = new CreateContactsExportRequest(List.of(idsFilter));
+            var response = client.contactsApi().contactExports().createContactExport(accountId, request);
       requestBody:
         content:
           application/json:
@@ -917,8 +935,10 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
+            
             var response = client.contactsApi().exports().get(accountId, exportId);
       responses:
         '200':
@@ -1036,10 +1056,15 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            import io.mailtrap.model.request.contactimports.Contact;
+            import io.mailtrap.model.request.contactimports.ImportContactsRequest;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var contacts = List.of(Map.of("email", "user1@example.com", "fields", Map.of("first_name", "John")));
-            var response = client.contactsApi().imports().create(accountId, contacts);
+            
+            var contact = new Contact("user1@example.com", Map.of("first_name", "John"), Collections.emptyList(), Collections.emptyList());
+            var importContactsRequest = new ImportContactsRequest(List.of(contact));
+            client.contactsApi().contactImports().importContacts(accountId, importContactsRequest);
       requestBody:
         content:
           application/json:
@@ -1141,7 +1166,8 @@ paths:
             import io.mailtrap.factory.MailtrapClientFactory;
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var response = client.contactsApi().imports().get(accountId, importId);
+            
+            var response = client.contactsApi().contactImports().getContactImport(accountId, importId);
       responses:
         '200':
           description: OK.
@@ -1231,9 +1257,11 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var response = client.contactsApi().lists().getAll(accountId);
+            
+            var response = client.contactsApi().contactLists().findAll(accountId);
       responses:
         '200':
           description: OK.
@@ -1313,9 +1341,12 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            import io.mailtrap.model.request.contactlists.CreateUpdateContactListRequest;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var response = client.contactsApi().lists().create(accountId, "Customers");
+            
+            var response = client.contactsApi().contactLists().createContactList(accountId, new CreateUpdateContactListRequest("Customers"));
       requestBody:
         content:
           application/json:
@@ -1401,9 +1432,12 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var response = client.contactsApi().lists().get(accountId, listId);
+            
+            long listId = 1L;
+            var response = client.contactsApi().contactLists().getContactList(accountId, listId);
       responses:
         '200':
           description: Returns attributes of the contact list.
@@ -1473,9 +1507,12 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var response = client.contactsApi().lists().update(accountId, listId, "Former Customers");
+            
+            long listId = 1L;
+            var response = client.contactsApi().contactLists().updateContactList(accountId, listId, new CreateUpdateContactListRequest("Former Customers"));
       requestBody:
         content:
           application/json:
@@ -1558,9 +1595,12 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            client.contactsApi().lists().delete(accountId, listId);
+            
+            long listId = 1L;
+            client.contactsApi().contactLists().deleteContactList(accountId, listId);
       responses:
         '204':
           description: Contact List successfully deleted
@@ -1632,9 +1672,11 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var response = client.contactsApi().fields().getAll(accountId);
+            
+            var response = client.contactsApi().contactFields().getAllContactFields(accountId);
       responses:
         '200':
           description: OK.
@@ -1719,9 +1761,14 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            import io.mailtrap.model.ContactFieldDataType;
+            import io.mailtrap.model.request.contactfields.CreateContactFieldRequest;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var response = client.contactsApi().fields().create(accountId, "Company", "text", "company");
+            
+            var request = new CreateContactFieldRequest("Company", ContactFieldDataType.TEXT, "company");
+            var response = client.contactsApi().contactFields().createContactField(accountId, request);
       requestBody:
         content:
           application/json:
@@ -1838,9 +1885,12 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var response = client.contactsApi().fields().get(accountId, fieldId);
+            
+            long fieldId = 2L;
+            var response = client.contactsApi().contactFields().getContactField(accountId, fieldId);
       responses:
         '200':
           description: Returns attributes of the contact field.
@@ -1913,9 +1963,13 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            import io.mailtrap.model.request.contactfields.UpdateContactFieldRequest;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var response = client.contactsApi().fields().update(accountId, fieldId, "Updated Name", "updated_name");
+            
+            var request = new UpdateContactFieldRequest("Updated Name", "updated_name");
+            var response = client.contactsApi().contactFields().updateContactField(accountId, fieldId, request);
       requestBody:
         content:
           application/json:
@@ -2020,9 +2074,12 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            client.contactsApi().fields().delete(accountId, fieldId);
+            
+            long fieldId = 2L;
+            client.contactsApi().contactFields().deleteContactField(accountId, fieldId);
       responses:
         '204':
           description: Contact Field successfully deleted
diff --git a/specs/email-api.openapi.yml b/specs/email-api.openapi.yml
index 6c63ab7..faf693d 100644
--- a/specs/email-api.openapi.yml
+++ b/specs/email-api.openapi.yml
@@ -848,6 +848,9 @@ paths:
             suppressions.forEach(suppression ->
                 System.out.println("Email: " + suppression.getEmail())
             );
+            filtered.forEach(filteredSuppression ->
+                System.out.println("Email: " + filteredSuppression.getEmail())
+            );
         - lang: shell
           label: 'cURL'
           source: |
@@ -1055,9 +1058,11 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var response = client.emailTemplatesApi().templates().getAll(accountId);
+            
+            var response = client.emailTemplatesApi().emailTemplates().getAllTemplates(accountId);
         - lang: shell
           label: cURL
           source: |
@@ -1171,11 +1176,14 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_TOKEN").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var request = new CreateTemplateRequest(
-                "Welcome Email", "Welcome to {{company_name}}!", "onboarding",
-                "<h1>Welcome {{user_name}}!</h1>", "Welcome {{user_name}}!"
+            
+            var request = new CreateEmailTemplateRequest(
+            new EmailTemplate(
+            "Welcome Email", "onboarding", "Welcome to {{company_name}}!",
+            "Welcome {{user_name}}!", "<h1>Welcome {{user_name}}!</h1>")
             );
             var template = client.emailTemplatesApi().emailTemplates().createEmailTemplate(accountId, request);
         - lang: shell
diff --git a/specs/email-batch.openapi.yml b/specs/email-batch.openapi.yml
index f7987a2..34105e9 100644
--- a/specs/email-batch.openapi.yml
+++ b/specs/email-batch.openapi.yml
@@ -207,35 +207,34 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
-            import io.mailtrap.model.Address;
-            import io.mailtrap.model.BatchMail;
+            import io.mailtrap.model.request.emails.Address;
+            import io.mailtrap.model.request.emails.BatchEmailBase;
+            import io.mailtrap.model.request.emails.MailtrapBatchMail;
+            import io.mailtrap.model.request.emails.MailtrapMail;
             import java.util.List;
-            import java.util.Map;
 
             var config = new MailtrapConfig.Builder()
                 .token("YOUR_API_KEY")
-                // Add .bulk(true) for Bulk Stream
                 .build();
 
-            var client = MailtrapClientFactory
-                .createMailtrapClient(config);
+            var client = MailtrapClientFactory.createMailtrapClient(config);
 
-            var base = BatchMail.Base.builder()
+            var base = BatchEmailBase.builder()
                 .from(new Address("sender@example.com"))
                 .subject("Monthly Newsletter")
                 .text("Check out our latest updates!")
                 .build();
 
             var requests = List.of(
-                BatchMail.Request.builder()
+                MailtrapMail.builder()
                     .to(List.of(new Address("user1@example.com")))
                     .build(),
-                BatchMail.Request.builder()
+                MailtrapMail.builder()
                     .to(List.of(new Address("user2@example.com")))
                     .build()
             );
 
-            var batchMail = BatchMail.builder()
+            var batchMail = MailtrapBatchMail.builder()
                 .base(base)
                 .requests(requests)
                 .build();
diff --git a/specs/email-sending-bulk.openapi.yml b/specs/email-sending-bulk.openapi.yml
index 9c64c6d..d72b979 100644
--- a/specs/email-sending-bulk.openapi.yml
+++ b/specs/email-sending-bulk.openapi.yml
@@ -172,8 +172,8 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
-            import io.mailtrap.model.Address;
-            import io.mailtrap.model.MailtrapMail;
+            import io.mailtrap.model.request.emails.Address;
+            import io.mailtrap.model.request.emails.MailtrapMail;
             import java.util.List;
 
             var config = new MailtrapConfig.Builder()
@@ -181,8 +181,7 @@ paths:
                 .bulk(true)  // Enable bulk sending
                 .build();
 
-            var client = MailtrapClientFactory
-                .createMailtrapClient(config);
+            var client = MailtrapClientFactory.createMailtrapClient(config);
 
             var mail = MailtrapMail.builder()
                 .from(new Address("marketing@example.com"))
@@ -195,7 +194,7 @@ paths:
                 .category("newsletter")
                 .build();
 
-            client.bulkApi().emails().send(mail);
+            client.bulkSendingApi().emails().send(mail);
         - lang: shell
           label: 'cURL'
           source: |
diff --git a/specs/email-sending-transactional.openapi.yml b/specs/email-sending-transactional.openapi.yml
index c32f4e7..f8b75a3 100644
--- a/specs/email-sending-transactional.openapi.yml
+++ b/specs/email-sending-transactional.openapi.yml
@@ -154,8 +154,7 @@ paths:
                 .token("YOUR_API_KEY")
                 .build();
 
-            var client = MailtrapClientFactory
-                .createMailtrapClient(config);
+            var client = MailtrapClientFactory.createMailtrapClient(config);
 
             var mail = MailtrapMail.builder()
                 .from(new Address("sender@example.com", "Sender Name"))
diff --git a/specs/general.openapi.yml b/specs/general.openapi.yml
index 5248eb1..4e7b1e7 100644
--- a/specs/general.openapi.yml
+++ b/specs/general.openapi.yml
@@ -174,11 +174,9 @@ paths:
                 .token("YOUR_API_TOKEN")
                 .build();
 
-            var client = MailtrapClientFactory
-                .createMailtrapClient(config)
-                .generalApi();
+            var client = MailtrapClientFactory.createMailtrapClient(config);
 
-            var accounts = client.accounts().getAll();
+            var accounts = client.generalApi().accounts().getAllAccounts();
 
             for (var account : accounts) {
                 System.out.println("Account: " + account.getName());
@@ -273,9 +271,12 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            import io.mailtrap.model.request.accountaccesses.ListAccountAccessQueryParams;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var response = client.generalApi().accountAccesses().getAll(accountId);
+            
+            var response = client.generalApi().accountAccesses().listUserAndInviteAccountAccesses(accountId, ListAccountAccessQueryParams.empty());
       parameters:
         - name: project_ids
           description: The identifiers of the projects for which to include the results
@@ -375,9 +376,11 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            client.generalApi().accountAccesses().delete(accountId, accessId);
+            
+            client.generalApi().accountAccesses().removeAccountAccess(accessId, accountId);
       responses:
         '200':
           description: Returns confirmation of successful deletion and id of the deleted access.
@@ -487,10 +490,24 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            import io.mailtrap.model.AccessLevel;
+            import io.mailtrap.model.ResourceType;
+            import io.mailtrap.model.request.permissions.ManagePermissionsRequest;
+            import io.mailtrap.model.request.permissions.Permission;
+  
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var permissions = List.of(Map.of("resource_id", "3281", "resource_type", "account", "access_level", "viewer"));
-            client.generalApi().permissions().bulkUpdate(accountId, accessId, permissions);
+            
+            final ManagePermissionsRequest request = new ManagePermissionsRequest(List.of(
+                new Permission(
+                    "3281",
+                    ResourceType.ACCOUNT,
+                    AccessLevel.VIEWER,
+                    false
+                )
+            ));
+            
+            client.generalApi().permissions().managePermissions(accessId, accountId, request);
       requestBody:
         content:
           application/json:
@@ -616,8 +633,10 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
+            
             var response = client.generalApi().permissions().getResources(accountId);
       responses:
         '200':
@@ -728,9 +747,11 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var response = client.generalApi().billing().getUsage(accountId);
+            
+            var response = client.generalApi().billing().getCurrentBillingCycleUsage(accountId);
       responses:
         '200':
           description: Returns an object with current billing cycle usage for Sandbox and Email Sending (Email API/SMTP) if available.
diff --git a/specs/sandbox.openapi.yml b/specs/sandbox.openapi.yml
index d032dfb..b65791a 100644
--- a/specs/sandbox.openapi.yml
+++ b/specs/sandbox.openapi.yml
@@ -198,14 +198,13 @@ paths:
                 .build();
 
             var client = MailtrapClientFactory
-                .createMailtrapClient(config)
-                .testingApi();
+                .createMailtrapClient(config);
 
             var request = new CreateUpdateProjectRequest(
                 new CreateUpdateProjectRequest.ProjectData("My New Project")
             );
 
-            var project = client.projects()
+            var project = client.testingApi().projects()
                 .createProject(accountId, request);
 
             System.out.println(project);
@@ -318,10 +317,9 @@ paths:
                 .build();
 
             var client = MailtrapClientFactory
-                .createMailtrapClient(config)
-                .testingApi();
+                .createMailtrapClient(config);
 
-            var projects = client.projects().getProjects(accountId);
+            var projects = client.testingApi().projects().getProjects(accountId);
 
             for (var project : projects) {
                 System.out.println("Project: " + project.getName() +
@@ -442,7 +440,7 @@ paths:
 
             long projectId = 12345L;
             var project = client.testingApi().projects()
-                .getProject(ACCOUNT_ID, projectId);
+                .getProject(accountId, projectId);
 
             System.out.println("Project: " + project.getName());
         - lang: shell
@@ -565,7 +563,7 @@ paths:
             );
 
             var updatedProject = client.testingApi().projects()
-                .updateProject(ACCOUNT_ID, projectId, request);
+                .updateProject(accountId, projectId, request);
 
             System.out.println("Project updated: " + updatedProject.getName());
         - lang: shell
@@ -699,7 +697,7 @@ paths:
 
             long projectId = 12345L;
             var deletedProject = client.testingApi().projects()
-                .deleteProject(ACCOUNT_ID, projectId);
+                .deleteProject(accountId, projectId);
 
             System.out.println("Project deleted: " + deletedProject.getId());
         - lang: shell
@@ -853,14 +851,14 @@ paths:
                 .build();
 
             var client = MailtrapClientFactory
-                .createMailtrapClient(config)
-                .testingApi();
+                .createMailtrapClient(config);
 
             var request = new CreateInboxRequest(
-                new CreateInboxRequest.InboxData("My Test Inbox")
+                new CreateInboxRequest.InboxCreateData("My Test Inbox")
             );
 
-            var inbox = client.inboxes()
+            long projectId = 12345L;
+            var inbox = client.testingApi().inboxes()
                 .createInbox(accountId, projectId, request);
 
             System.out.println("Inbox created: " + inbox.getName());
@@ -985,7 +983,7 @@ paths:
 
             long inboxId = 12345L;
             var inboxAttributes = client.testingApi().inboxes()
-                .getInboxAttributes(ACCOUNT_ID, inboxId);
+                .getInboxAttributes(accountId, inboxId);
 
             System.out.println(inboxAttributes);
         - lang: shell
@@ -1256,7 +1254,7 @@ paths:
             );
 
             var updatedInbox = client.testingApi().inboxes()
-                .updateInbox(ACCOUNT_ID, inboxId, updateRequest);
+                .updateInbox(accountId, inboxId, updateRequest);
 
             System.out.println(updatedInbox);
         - lang: shell
@@ -1382,7 +1380,7 @@ paths:
 
             long inboxId = 12345L;
             var cleanedInbox = client.testingApi().inboxes()
-                .cleanInbox(ACCOUNT_ID, inboxId);
+                .cleanInbox(accountId, inboxId);
 
             System.out.println(cleanedInbox);
         - lang: shell
@@ -1501,7 +1499,7 @@ paths:
 
             long inboxId = 12345L;
             var markedInbox = client.testingApi().inboxes()
-                .markAsRead(ACCOUNT_ID, inboxId);
+                .markAsRead(accountId, inboxId);
 
             System.out.println(markedInbox);
         - lang: shell
@@ -1620,7 +1618,7 @@ paths:
 
             long inboxId = 12345L;
             var updatedInbox = client.testingApi().inboxes()
-                .resetCredentials(ACCOUNT_ID, inboxId);
+                .resetCredentials(accountId, inboxId);
 
             System.out.println(updatedInbox);
         - lang: shell
@@ -1739,7 +1737,7 @@ paths:
 
             long inboxId = 12345L;
             var updatedInbox = client.testingApi().inboxes()
-                .enableEmailAddress(ACCOUNT_ID, inboxId);
+                .enableEmailAddress(accountId, inboxId);
 
             System.out.println(updatedInbox);
         - lang: shell
@@ -1858,7 +1856,7 @@ paths:
 
             long inboxId = 12345L;
             var updatedInbox = client.testingApi().inboxes()
-                .resetEmailAddresses(ACCOUNT_ID, inboxId);
+                .resetEmailAddresses(accountId, inboxId);
 
             System.out.println(updatedInbox);
         - lang: shell
@@ -1967,7 +1965,7 @@ paths:
                 .createMailtrapClient(config);
 
             var inboxes = client.testingApi().inboxes()
-                .getInboxes(ACCOUNT_ID);
+                .getInboxes(accountId);
 
             System.out.println(inboxes);
         - lang: shell
@@ -2554,7 +2552,7 @@ paths:
             long messageId = 67890L;
 
             var message = client.testingApi().messages()
-                .getMessage(ACCOUNT_ID, inboxId, messageId);
+                .getMessage(accountId, inboxId, messageId);
 
             System.out.println(message);
       operationId: showInboxEmailMessage
@@ -2799,7 +2797,7 @@ paths:
             );
 
             var updatedMessage = client.testingApi().messages()
-                .updateMessage(ACCOUNT_ID, inboxId, messageId, updateRequest);
+                .updateMessage(accountId, inboxId, messageId, updateRequest);
 
             System.out.println(updatedMessage);
       operationId: updateInboxEmailMessage
@@ -3006,7 +3004,7 @@ paths:
             long messageId = 67890L;
 
             var deletedMessage = client.testingApi().messages()
-                .deleteMessage(ACCOUNT_ID, inboxId, messageId);
+                .deleteMessage(accountId, inboxId, messageId);
 
             System.out.println(deletedMessage);
       operationId: deleteInboxEmailMessage
@@ -3224,10 +3222,10 @@ paths:
                 .build();
 
             var client = MailtrapClientFactory
-                .createMailtrapClient(config)
-                .testingApi();
+                .createMailtrapClient(config);
 
-            var messages = client.messages()
+            long inboxId = 12345L;
+            var messages = client.testingApi().messages()
                 .getMessages(accountId, inboxId);
 
             for (var message : messages) {
@@ -3421,7 +3419,7 @@ paths:
 
             var forwardRequest = new ForwardMessageRequest("recipient@example.com");
             var forwardedMessage = client.testingApi().messages()
-                .forwardMessage(ACCOUNT_ID, inboxId, messageId, forwardRequest);
+                .forwardMessage(accountId, inboxId, messageId, forwardRequest);
 
             System.out.println(forwardedMessage);
       operationId: forwardInboxEmailMessage
@@ -3565,7 +3563,10 @@ paths:
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
 
-            var spamReport = client.testingApi().messages().getSpamScore(ACCOUNT_ID, 12345L, 67890L);
+            long inboxId = 12345L;
+            long messageId = 67890L;
+
+            var spamReport = client.testingApi().messages().getSpamScore(accountId, inboxId, messageId);
             System.out.println(spamReport);
       operationId: getInboxEmailMessageSpamReport
     parameters:
@@ -3730,7 +3731,8 @@ paths:
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
 
-            var htmlAnalysis = client.testingApi().messages().getMessageHtmlAnalysis(ACCOUNT_ID, 12345L, 67890L);
+            long inboxId = 12345L;
+            var htmlAnalysis = client.testingApi().messages().getMessageHtmlAnalysis(accountId, inboxId, messageId);
             System.out.println(htmlAnalysis);
       operationId: getInboxEmailMessageHTMLAnalysis
     parameters:
@@ -3837,9 +3839,14 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            String textBody = client.testingApi().messages().getTextMessage(ACCOUNT_ID, 12345L, 67890L);
+            
+            long inboxId = 12345L;
+            long messageId = 67890L;
+
+            String textBody = client.testingApi().messages().getTextMessage(accountId, inboxId, messageId);
             System.out.println(textBody);
       operationId: getInboxEmailMessageBodyAsTxt
     parameters:
@@ -3990,9 +3997,14 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            String rawBody = client.testingApi().messages().getRawMessage(ACCOUNT_ID, 12345L, 67890L);
+            
+            long inboxId = 12345L;
+            long messageId = 67890L;
+
+            String rawBody = client.testingApi().messages().getRawMessage(accountId, inboxId, messageId);
             System.out.println(rawBody);
       operationId: getInboxEmailMessageBodyAsRaw
     parameters:
@@ -4118,9 +4130,14 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            String htmlSource = client.testingApi().messages().getMessageSource(ACCOUNT_ID, 12345L, 67890L);
+            
+            long inboxId = 12345L;
+            long messageId = 67890L;
+
+            String htmlSource = client.testingApi().messages().getMessageSource(accountId, inboxId, messageId);
             System.out.println(htmlSource);
       operationId: getInboxEmailMessageBodyAsHtmlSource
     parameters:
@@ -4248,9 +4265,13 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            String htmlBody = client.testingApi().messages().getHtmlMessage(ACCOUNT_ID, 12345L, 67890L);
+            
+            long inboxId = 12345L;
+            long messageId = 12345L;
+            String htmlBody = client.testingApi().messages().getHtmlMessage(accountId, inboxId, messageId);
             System.out.println(htmlBody);
       operationId: getInboxEmailMessageBodyAsHtml
     parameters:
@@ -4402,9 +4423,14 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            String emlContent = client.testingApi().messages().getMessageAsEml(ACCOUNT_ID, 12345L, 67890L);
+            
+            long inboxId = 12345L;
+            long messageId = 67890L;
+
+            String emlContent = client.testingApi().messages().getMessageAsEml(accountId, inboxId, messageId);
             System.out.println(emlContent);
       operationId: getInboxEmailMessageBodyAsEml
     parameters:
@@ -4506,9 +4532,14 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             var config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
             var client = MailtrapClientFactory.createMailtrapClient(config);
-            var mailHeaders = client.testingApi().messages().getMailHeaders(ACCOUNT_ID, 12345L, 67890L);
+            
+            long inboxId = 12345L;
+            long messageId = 67890L;
+
+            var mailHeaders = client.testingApi().messages().getMailHeaders(accountId, inboxId, messageId);
             System.out.println(mailHeaders);
       operationId: getMailHeadersOfEmailMessage
     parameters:
@@ -4637,9 +4668,15 @@ paths:
           source: |
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
+            
             MailtrapConfig config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
-            var testingClient = MailtrapClientFactory.createMailtrapClient(config).testingApi();
-            var attachments = testingClient.attachments().getAttachments(12345L, 67890L, 111111L, null);
+            
+            var client = MailtrapClientFactory.createMailtrapClient(config);
+            
+            long inboxId = 12345L;
+            long messageId = 67890L;
+            
+            var attachments = client.testingApi().attachments().getAttachments(accountId, inboxId, messageId, null);
     parameters:
       - $ref: '#/components/parameters/account_id'
       - $ref: '#/components/parameters/inbox_id'
@@ -4760,8 +4797,13 @@ paths:
             import io.mailtrap.config.MailtrapConfig;
             import io.mailtrap.factory.MailtrapClientFactory;
             MailtrapConfig config = new MailtrapConfig.Builder().token("YOUR_API_KEY").build();
-            var testingClient = MailtrapClientFactory.createMailtrapClient(config).testingApi();
-            var attachment = testingClient.attachments().getSingleAttachment(12345L, 67890L, 111111L, 222222L);
+            
+            long inboxId = 12345L;
+            long messageId = 67890L;
+            long attachmentId = 222222L;
+            
+            var client = MailtrapClientFactory.createMailtrapClient(config);
+            var attachment = client.testingApi().attachments().getSingleAttachment(accountId, inboxId, messageId, attachmentId);
     parameters:
       - $ref: '#/components/parameters/account_id'
       - $ref: '#/components/parameters/inbox_id'