diff --git a/core/slee/services/mtsbb/src/test/java/org/mobicents/smsc/slee/services/mt/MtSbbProxy.java b/core/slee/services/mtsbb/src/test/java/org/mobicents/smsc/slee/services/mt/MtSbbProxy.java
index f4cf14489..4a8496518 100644
--- a/core/slee/services/mtsbb/src/test/java/org/mobicents/smsc/slee/services/mt/MtSbbProxy.java
+++ b/core/slee/services/mtsbb/src/test/java/org/mobicents/smsc/slee/services/mt/MtSbbProxy.java
@@ -55,6 +55,7 @@
 import org.mobicents.smsc.slee.resources.persistence.PersistenceRAInterfaceProxy;
 import org.mobicents.smsc.slee.resources.persistence.TraceProxy;
 import org.mobicents.smsc.slee.resources.scheduler.SchedulerRaSbbInterface;
+import org.mobicents.smsc.slee.services.deliverysbb.ChunkDataList;
 import org.mobicents.smsc.slee.services.deliverysbb.PendingRequestsList;
 import org.mobicents.smsc.slee.services.smpp.server.events.InformServiceCenterContainer;
 import org.mobicents.smsc.slee.services.smpp.server.events.SendRsdsEvent;
@@ -486,29 +487,40 @@ public TimerID getDeliveryTimerID() {
     @Override
     public void setDeliveryTimerID(TimerID val) {
         // TODO Auto-generated method stub
-        
     }
 
 	@Override
-	public void setDeliveryPendingCount(long currentPendingCount) {
+	public void setLastLocalSequenceNumber(int value) {
 		// TODO Auto-generated method stub
 		
 	}
 
 	@Override
-	public long getDeliveryPendingCount() {
+	public int getLastLocalSequenceNumber() {
 		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
-	public void setPendingChunks(List<PduRequest> value) {
+	public void setSentChunks(ChunkDataList value) {
 		// TODO Auto-generated method stub
 		
 	}
 
 	@Override
-	public List<PduRequest> getPendingChunks() {
+	public ChunkDataList getSentChunks() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void setPendingChunks(ChunkDataList value) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public ChunkDataList getPendingChunks() {
 		// TODO Auto-generated method stub
 		return null;
 	}
diff --git a/core/slee/services/mtsbb/src/test/java/org/mobicents/smsc/slee/services/mt/MtTest3.java b/core/slee/services/mtsbb/src/test/java/org/mobicents/smsc/slee/services/mt/MtTest3.java
index be43204f6..6c7941d84 100644
--- a/core/slee/services/mtsbb/src/test/java/org/mobicents/smsc/slee/services/mt/MtTest3.java
+++ b/core/slee/services/mtsbb/src/test/java/org/mobicents/smsc/slee/services/mt/MtTest3.java
@@ -29,6 +29,7 @@
 import org.mobicents.smsc.library.Sms;
 import org.mobicents.smsc.library.SmsDeliveryReportData;
 import org.mobicents.smsc.library.SmsSet;
+import org.mobicents.smsc.slee.services.deliverysbb.ChunkDataList;
 import org.mobicents.smsc.slee.services.deliverysbb.PendingRequestsList;
 import org.mobicents.smsc.slee.services.smpp.server.events.InformServiceCenterContainer;
 import org.mobicents.smsc.slee.services.smpp.server.events.SendRsdsEvent;
@@ -315,25 +316,37 @@ public void setDeliveryTimerID(TimerID val) {
         }
 
 		@Override
-		public void setDeliveryPendingCount(long currentPendingCount) {
+		public void setLastLocalSequenceNumber(int value) {
 			// TODO Auto-generated method stub
 			
 		}
 
 		@Override
-		public long getDeliveryPendingCount() {
+		public int getLastLocalSequenceNumber() {
 			// TODO Auto-generated method stub
 			return 0;
 		}
 
 		@Override
-		public void setPendingChunks(List<PduRequest> value) {
+		public void setSentChunks(ChunkDataList value) {
 			// TODO Auto-generated method stub
 			
 		}
 
 		@Override
-		public List<PduRequest> getPendingChunks() {
+		public ChunkDataList getSentChunks() {
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		@Override
+		public void setPendingChunks(ChunkDataList value) {
+			// TODO Auto-generated method stub
+			
+		}
+
+		@Override
+		public ChunkDataList getPendingChunks() {
 			// TODO Auto-generated method stub
 			return null;
 		}
diff --git a/core/slee/services/mtsbb/src/test/java/org/mobicents/smsc/slee/services/mt/SriSbbProxy.java b/core/slee/services/mtsbb/src/test/java/org/mobicents/smsc/slee/services/mt/SriSbbProxy.java
index 986ce08cb..f26048baa 100644
--- a/core/slee/services/mtsbb/src/test/java/org/mobicents/smsc/slee/services/mt/SriSbbProxy.java
+++ b/core/slee/services/mtsbb/src/test/java/org/mobicents/smsc/slee/services/mt/SriSbbProxy.java
@@ -50,6 +50,7 @@
 import org.mobicents.smsc.slee.resources.persistence.PersistenceRAInterfaceProxy;
 import org.mobicents.smsc.slee.resources.persistence.TraceProxy;
 import org.mobicents.smsc.slee.resources.scheduler.SchedulerRaSbbInterface;
+import org.mobicents.smsc.slee.services.deliverysbb.ChunkDataList;
 import org.mobicents.smsc.slee.services.deliverysbb.PendingRequestsList;
 import org.mobicents.smsc.slee.services.smpp.server.events.InformServiceCenterContainer;
 import org.mobicents.smsc.slee.services.smpp.server.events.SendMtEvent;
@@ -380,25 +381,37 @@ public void setDeliveryTimerID(TimerID val) {
     }
 
 	@Override
-	public void setDeliveryPendingCount(long currentPendingCount) {
+	public void setLastLocalSequenceNumber(int value) {
 		// TODO Auto-generated method stub
 		
 	}
 
 	@Override
-	public long getDeliveryPendingCount() {
+	public int getLastLocalSequenceNumber() {
 		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
-	public void setPendingChunks(List<PduRequest> value) {
+	public void setSentChunks(ChunkDataList value) {
 		// TODO Auto-generated method stub
 		
 	}
 
 	@Override
-	public List<PduRequest> getPendingChunks() {
+	public ChunkDataList getSentChunks() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void setPendingChunks(ChunkDataList value) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public ChunkDataList getPendingChunks() {
 		// TODO Auto-generated method stub
 		return null;
 	}
diff --git a/core/slee/services/rxsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java b/core/slee/services/rxsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java
index 0e9be54ac..93436fc06 100644
--- a/core/slee/services/rxsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java
+++ b/core/slee/services/rxsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java
@@ -78,6 +78,7 @@
 import org.mobicents.smsc.slee.resources.scheduler.PduRequestTimeout2;
 import org.mobicents.smsc.slee.resources.scheduler.SchedulerRaSbbInterface;
 import org.mobicents.smsc.slee.resources.scheduler.SendPduStatus2;
+import org.mobicents.smsc.slee.services.deliverysbb.ChunkDataList;
 import org.mobicents.smsc.slee.services.deliverysbb.PendingRequestsList;
 import org.mobicents.smsc.slee.services.smpp.server.events.SmsSetEvent;
 import org.mobicents.smsc.slee.services.smpp.server.rx.stub.RxSmppServerSbbUsageStub;
@@ -625,25 +626,37 @@ public void fireSendPduStatusChild(SendPduStatus2 event, ActivityContextInterfac
         }
 
 		@Override
-		public void setDeliveryPendingCount(long currentPendingCount) {
+		public void setLastLocalSequenceNumber(int value) {
 			// TODO Auto-generated method stub
 			
 		}
 
 		@Override
-		public long getDeliveryPendingCount() {
+		public int getLastLocalSequenceNumber() {
 			// TODO Auto-generated method stub
 			return 0;
 		}
 
 		@Override
-		public void setPendingChunks(List<PduRequest> value) {
+		public void setSentChunks(ChunkDataList value) {
 			// TODO Auto-generated method stub
 			
 		}
 
 		@Override
-		public List<PduRequest> getPendingChunks() {
+		public ChunkDataList getSentChunks() {
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		@Override
+		public void setPendingChunks(ChunkDataList value) {
+			// TODO Auto-generated method stub
+			
+		}
+
+		@Override
+		public ChunkDataList getPendingChunks() {
 			// TODO Auto-generated method stub
 			return null;
 		}
diff --git a/core/slee/services/sbbs/src/test/java/org/mobicents/smsc/slee/services/deliverysbb/DeliveryCommonSbbTest.java b/core/slee/services/sbbs/src/test/java/org/mobicents/smsc/slee/services/deliverysbb/DeliveryCommonSbbTest.java
index 5b867c81a..6c7d18a76 100644
--- a/core/slee/services/sbbs/src/test/java/org/mobicents/smsc/slee/services/deliverysbb/DeliveryCommonSbbTest.java
+++ b/core/slee/services/sbbs/src/test/java/org/mobicents/smsc/slee/services/deliverysbb/DeliveryCommonSbbTest.java
@@ -763,27 +763,39 @@ protected void onDeliveryTimeout(SmsSet smsSet, String reason) {
         }
 
 		@Override
-		public void setDeliveryPendingCount(long currentPendingCount) {
+		public void setLastLocalSequenceNumber(int value) {
 			// TODO Auto-generated method stub
 			
 		}
 
 		@Override
-		public long getDeliveryPendingCount() {
+		public int getLastLocalSequenceNumber() {
 			// TODO Auto-generated method stub
 			return 0;
 		}
 
 		@Override
-		public void setPendingChunks(List<PduRequest> value) {
+		public void setSentChunks(ChunkDataList value) {
 			// TODO Auto-generated method stub
 			
 		}
 
 		@Override
-		public List<PduRequest> getPendingChunks() {
+		public ChunkDataList getSentChunks() {
 			// TODO Auto-generated method stub
-			return new ArrayList<PduRequest>();
+			return null;
+		}
+
+		@Override
+		public void setPendingChunks(ChunkDataList value) {
+			// TODO Auto-generated method stub
+			
+		}
+
+		@Override
+		public ChunkDataList getPendingChunks() {
+			// TODO Auto-generated method stub
+			return null;
 		}
     }