diff --git a/pom.xml b/pom.xml
index 625d1ee..142e611 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,8 +12,9 @@
   <properties>
     <revision>4.31.0</revision>
     <changelist>-SNAPSHOT</changelist>
-    <carbonio-revision>4.26.0</carbonio-revision>
+    <carbonio-revision>4.27.1</carbonio-revision>
     <carbonio.version>${carbonio-revision}${changelist}</carbonio.version>
+    <directory-server.version>4.32.0-SNAPSHOT</directory-server.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jackson.version>2.15.4</jackson.version>
     <jfreechart.version>1.0.15</jfreechart.version>
@@ -185,6 +186,42 @@
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>com.zextras</groupId>
+      <artifactId>mailbox-attribute-manager</artifactId>
+      <version>${directory-server.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>com.zextras</groupId>
+      <artifactId>zattr</artifactId>
+      <version>${directory-server.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>com.zextras</groupId>
+      <artifactId>right-manager</artifactId>
+      <version>${carbonio.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
@@ -422,6 +459,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>com.zextras</groupId>
+      <artifactId>zm-store</artifactId>
+      <version>${carbonio.version}</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>com.zextras</groupId>
       <artifactId>zm-store</artifactId>
diff --git a/src/main/java/org/openzal/zal/DomainStatus.java b/src/main/java/org/openzal/zal/DomainStatus.java
index ae743f8..1672d8a 100644
--- a/src/main/java/org/openzal/zal/DomainStatus.java
+++ b/src/main/java/org/openzal/zal/DomainStatus.java
@@ -20,6 +20,7 @@
 
 package org.openzal.zal;
 
+import com.zextras.entry.IServiceException;
 import com.zimbra.common.account.ZAttrProvisioning;
 import com.zimbra.common.service.ServiceException;
 import com.zimbra.cs.account.Provisioning;
@@ -48,7 +49,7 @@ protected DomainStatus(@Nonnull Object domainStatus) {
   public DomainStatus(@Nonnull String domainStatusString) {
     try {
       this.domainStatus = ZAttrProvisioning.DomainStatus.fromString(domainStatusString);
-    } catch (ServiceException e) {
+    } catch (IServiceException e) {
       throw ExceptionWrapper.wrap(e);
     }
   }
diff --git a/src/main/java/org/openzal/zal/PrefExternalSendersType.java b/src/main/java/org/openzal/zal/PrefExternalSendersType.java
index 1e3824f..94226b7 100644
--- a/src/main/java/org/openzal/zal/PrefExternalSendersType.java
+++ b/src/main/java/org/openzal/zal/PrefExternalSendersType.java
@@ -20,6 +20,7 @@
 
 package org.openzal.zal;
 
+import com.zextras.entry.IServiceException;
 import org.openzal.zal.exceptions.ExceptionWrapper;
 import org.openzal.zal.exceptions.ZimbraException;
 import com.zimbra.common.account.ZAttrProvisioning;
@@ -57,7 +58,7 @@ public static PrefExternalSendersType fromString(String s)
     {
       return new PrefExternalSendersType(ZAttrProvisioning.PrefExternalSendersType.fromString(s));
     }
-    catch (ServiceException e)
+    catch (IServiceException e)
     {
       throw ExceptionWrapper.wrap(e);
     }