diff --git a/package-lock.json b/package-lock.json
index ebe2f4a..c96e062 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "@nestjs/platform-express": "^8.4.3",
         "@nestjs/schedule": "^1.1.0",
         "@nestjs/swagger": "^5.2.1",
-        "@victorradael/protospack": "2.5.0-5",
+        "@victorradael/protospack": "2.5.0-6",
         "axios": "^0.25.0",
         "cron-parser": "^4.4.0",
         "dotenv": "^14.2.0",
@@ -2360,9 +2360,9 @@
       }
     },
     "node_modules/@victorradael/protospack": {
-      "version": "2.5.0-5",
-      "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.5.0-5.tgz",
-      "integrity": "sha512-neuxFp5FSBBNjHspLXs/hBdlB/9sy3Wh5AR4O7KyB5QBK0MO5iOCdQf+9wAAKM9N+C2JNVzIq/Mdxe5hAMiJLA==",
+      "version": "2.5.0-6",
+      "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.5.0-6.tgz",
+      "integrity": "sha512-3SYQ+VMWRaBi3HAX8A4n+roTX+pVvrhMFqtunChfjzuHlueWsH/ASttCI2DrqVK2yZP6RdO6unKawd8pmeXmJw==",
       "dependencies": {
         "rxjs": "^7.5.5"
       }
@@ -10935,9 +10935,9 @@
       }
     },
     "@victorradael/protospack": {
-      "version": "2.5.0-5",
-      "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.5.0-5.tgz",
-      "integrity": "sha512-neuxFp5FSBBNjHspLXs/hBdlB/9sy3Wh5AR4O7KyB5QBK0MO5iOCdQf+9wAAKM9N+C2JNVzIq/Mdxe5hAMiJLA==",
+      "version": "2.5.0-6",
+      "resolved": "https://registry.npmjs.org/@victorradael/protospack/-/protospack-2.5.0-6.tgz",
+      "integrity": "sha512-3SYQ+VMWRaBi3HAX8A4n+roTX+pVvrhMFqtunChfjzuHlueWsH/ASttCI2DrqVK2yZP6RdO6unKawd8pmeXmJw==",
       "requires": {
         "rxjs": "^7.5.5"
       }
diff --git a/package.json b/package.json
index 8713d99..9891a51 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "@nestjs/platform-express": "^8.4.3",
     "@nestjs/schedule": "^1.1.0",
     "@nestjs/swagger": "^5.2.1",
-    "@victorradael/protospack": "2.5.0-5",
+    "@victorradael/protospack": "2.5.0-6",
     "axios": "^0.25.0",
     "cron-parser": "^4.4.0",
     "dotenv": "^14.2.0",
diff --git a/src/clients/inputs/client.service.ts b/src/clients/inputs/client.service.ts
index 805e3a0..e8b4291 100644
--- a/src/clients/inputs/client.service.ts
+++ b/src/clients/inputs/client.service.ts
@@ -38,9 +38,11 @@ export class InputsClientService implements OnModuleInit {
   async newCreate(createInputDto: InputNewCreateRequest) {
     console.log('InputClientService', 'Create');
 
-    return await lastValueFrom(
+    const input = await lastValueFrom(
       this.inputService.NewCreate(objectSnakeToCamel(createInputDto)),
     );
+    objectCamelToSnake(input);
+    return input;
   }
 
   async createGeneric(createInputGeneric) {
@@ -55,11 +57,12 @@ export class InputsClientService implements OnModuleInit {
     };
     objectSnakeToCamel(grpcPayload);
 
-    const structPayload = await lastValueFrom(
+    const structReturn = await lastValueFrom(
       this.inputService.Create(grpcPayload),
     );
-    objectCamelToSnake(structPayload);
-    return DecodeGrpcStruct(structPayload.input);
+    objectCamelToSnake(structReturn);
+    const inputCreated = DecodeGrpcStruct(structReturn.input);
+    return { input: inputCreated };
   }
 
   async createS3Inputs(createInputDto: InputCreateS3Request) {
diff --git a/src/modules/inputs/inputs.service.ts b/src/modules/inputs/inputs.service.ts
index 714e35c..2d41455 100644
--- a/src/modules/inputs/inputs.service.ts
+++ b/src/modules/inputs/inputs.service.ts
@@ -13,6 +13,7 @@ export class InputsService {
 
   adjustInputPayload(payload) {
     if (payload?.input_generic) return DecodeGrpcStruct(payload.input_generic);
+    if (!payload.input_s3 && !payload.input_jdbc) return payload;
     return payload?.input_s3 || payload?.input_jdbc;
   }
   getDifferenceInSeconds(date1: Date, date2: Date) {
@@ -60,17 +61,19 @@ export class InputsService {
           input: inputPayload,
           info,
         });
-        return response;
+        break;
       case 'oracle':
       case 'mysql':
       case 'postgresql':
       case 'sqlserver':
         response = await this.inputClient.newCreate(data);
-        return { input: response?.input?.input_jdbc };
+        break;
       default:
         response = await this.inputClient.createGeneric(data);
-        return response;
+        break;
     }
+    const adjustedInput = this.adjustInputPayload(response.input);
+    return { ...response, input: adjustedInput };
   }
   async getAvailableEntities(data): Promise<{ entities: string[] }> {
     return await this.inputClient.getAvailableEntities(data);