diff --git a/extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountPaymentProvider.java b/extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountPaymentProvider.java
index 6e00e38c0..1855afe05 100644
--- a/extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountPaymentProvider.java
+++ b/extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountPaymentProvider.java
@@ -22,6 +22,11 @@ public class AccountPaymentProvider extends SimpleEntity {
 
     @Column(length = 500)
     private String webCheckoutSecret;
+    @Column(length = 500)
+    private String webCheckoutURL;
+    @Column(length = 500)
+    private String librariesURL;
+    private String providerAlias;
 
     @Column(length = 500)
     private String eventsSecret;
@@ -173,4 +178,28 @@ public String getPaymentProcessor() {
     public void setPaymentProcessor(String paymentProcessor) {
         this.paymentProcessor = paymentProcessor;
     }
+
+    public String getWebCheckoutURL() {
+        return webCheckoutURL;
+    }
+
+    public void setWebCheckoutURL(String webCheckoutURL) {
+        this.webCheckoutURL = webCheckoutURL;
+    }
+
+    public String getLibrariesURL() {
+        return librariesURL;
+    }
+
+    public void setLibrariesURL(String librariesURL) {
+        this.librariesURL = librariesURL;
+    }
+
+    public String getProviderAlias() {
+        return providerAlias;
+    }
+
+    public void setProviderAlias(String providerAlias) {
+        this.providerAlias = providerAlias;
+    }
 }
diff --git a/extensions/saas/sources/core/src/main/resources/META-INF/descriptors/AccountPaymentProviderForm.yml b/extensions/saas/sources/core/src/main/resources/META-INF/descriptors/AccountPaymentProviderForm.yml
index e3d73c9ab..06ac86056 100644
--- a/extensions/saas/sources/core/src/main/resources/META-INF/descriptors/AccountPaymentProviderForm.yml
+++ b/extensions/saas/sources/core/src/main/resources/META-INF/descriptors/AccountPaymentProviderForm.yml
@@ -3,6 +3,7 @@ beanClass: tools.dynamia.modules.saas.domain.AccountPaymentProvider
 autofields: false
 
 fields:
+  # General
   name:
   paymentProcessor:
     label: Processor
@@ -11,19 +12,29 @@ fields:
       className: tools.dynamia.modules.saas.AccountPaymentProcessor
       nameField: name
       idField: id
+  providerAlias:
+    label: Provider Alias
   merchantId:
+  testMode:
+  active:
+
+  # Credentials
   apiKey:
   apiSecret:
-  webCheckoutSecret:
   integritySecret:
-  eventsSecret:
-  webhooksSecret:
 
+  # Endpoints
   serviceURL:
-    label: Service URL
-  testMode:
-  active:
+    label: API Service URL
+  webCheckoutURL:
+  librariesURL:
 
+  # Webhooks & events
+  webCheckoutSecret:
+  eventsSecret:
+  webhooksSecret:
+
+  # Extra
   extra0:
     label: Extra 0
   extra1:
@@ -34,13 +45,21 @@ fields:
     label: Extra 3
 
 groups:
+  credentials:
+    label: Credentials
+    fields: [ apiKey, apiSecret, integritySecret ]
+
+  endpoints:
+    label: Endpoints
+    fields: [ serviceURL, webCheckoutURL, librariesURL ]
+
+  webhooks:
+    label: Webhooks & Events
+    fields: [ webCheckoutSecret, eventsSecret, webhooksSecret ]
+
   extraProperties:
     label: Extra Properties
-    fields:
-      - extra0
-      - extra1
-      - extra2
-      - extra3
+    fields: [ extra0, extra1, extra2, extra3 ]
 
 layout:
-  columns: 4
\ No newline at end of file
+  columns: 4