diff --git a/compile.sh b/compile.sh
index 507ee01..81b44f0 100755
--- a/compile.sh
+++ b/compile.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-(cd snippets && mvn clean spotless:apply)
-(cd snippets && ./compile.sh)
+(cd snippets && mvn clean spotless:apply) || exit 1
+(cd snippets && ./compile.sh)  ||exit 1
 
diff --git a/snippets/compile.sh b/snippets/compile.sh
index eb921f1..167484f 100755
--- a/snippets/compile.sh
+++ b/snippets/compile.sh
@@ -6,9 +6,5 @@ echo "Compiling snippets:"
 for snippet in $SNIPPETS
 do
  echo " - Snippet: $snippet"
-  mvn compile -Dsnippet="$(dirname $snippet)"
-  if [ $? -ne 0 ]
-  then
-    exit $?
-  fi
+  mvn compile -Dsnippet="$(dirname $snippet)" || exit 1
 done
diff --git a/snippets/numbers/active_update/Snippet.java b/snippets/numbers/active_update/Snippet.java
index 78e94d9..a7965d3 100644
--- a/snippets/numbers/active_update/Snippet.java
+++ b/snippets/numbers/active_update/Snippet.java
@@ -1,10 +1,10 @@
 package numbers;
 
-import com.sinch.sdk.domains.numbers.ActiveNumberService;
-import com.sinch.sdk.domains.numbers.NumbersService;
-import com.sinch.sdk.domains.numbers.models.ActiveNumber;
-import com.sinch.sdk.domains.numbers.models.requests.ActiveNumberUpdateRequestParameters;
-import com.sinch.sdk.domains.numbers.models.requests.ActiveNumberUpdateVoiceConfigurationRequestParameters;
+import com.sinch.sdk.domains.numbers.api.v1.NumbersService;
+import com.sinch.sdk.domains.numbers.models.v1.ActiveNumber;
+import com.sinch.sdk.domains.numbers.models.v1.VoiceConfiguration;
+import com.sinch.sdk.domains.numbers.models.v1.VoiceConfigurationRTC;
+import com.sinch.sdk.domains.numbers.models.v1.request.ActiveNumberUpdateRequest;
 import java.util.logging.Logger;
 
 public class Snippet {
@@ -13,22 +13,19 @@ public class Snippet {
 
   static void execute(NumbersService numbersService) {
 
-    ActiveNumberService activeNumbersService = numbersService.active();
-
     String phoneNumber = "YOUR_phone_number_to_be_updated";
     String appId = "YOUR_app_id";
     String displayName = "Updated from Sinch Java SDK";
 
-    ActiveNumberUpdateVoiceConfigurationRequestParameters voiceConfiguration =
-        ActiveNumberUpdateVoiceConfigurationRequestParameters.builder().setAppId(appId).build();
+    VoiceConfiguration voiceConfiguration = VoiceConfigurationRTC.builder().setAppId(appId).build();
 
-    ActiveNumberUpdateRequestParameters updateRequest =
-        ActiveNumberUpdateRequestParameters.builder()
+    ActiveNumberUpdateRequest updateRequest =
+        ActiveNumberUpdateRequest.builder()
             .setDisplayName(displayName)
             .setVoiceConfiguration(voiceConfiguration)
             .build();
 
-    ActiveNumber response = activeNumbersService.update(phoneNumber, updateRequest);
+    ActiveNumber response = numbersService.update(phoneNumber, updateRequest);
 
     LOGGER.info(String.format("Updated number: %s", response));
   }
diff --git a/snippets/numbers/available_list/Snippet.java b/snippets/numbers/available_list/Snippet.java
index d164b1c..56efc89 100644
--- a/snippets/numbers/available_list/Snippet.java
+++ b/snippets/numbers/available_list/Snippet.java
@@ -1,9 +1,9 @@
 package numbers;
 
-import com.sinch.sdk.domains.numbers.*;
-import com.sinch.sdk.domains.numbers.models.*;
-import com.sinch.sdk.domains.numbers.models.requests.*;
-import com.sinch.sdk.domains.numbers.models.responses.AvailableNumberListResponse;
+import com.sinch.sdk.domains.numbers.api.v1.NumbersService;
+import com.sinch.sdk.domains.numbers.models.v1.NumberType;
+import com.sinch.sdk.domains.numbers.models.v1.request.AvailableNumberListRequest;
+import com.sinch.sdk.domains.numbers.models.v1.response.AvailableNumberListResponse;
 import java.util.logging.Logger;
 
 public class Snippet {
@@ -12,18 +12,13 @@ public class Snippet {
 
   static void execute(NumbersService numbersService) {
 
-    AvailableNumberService availableNumbersService = numbersService.available();
-
     String regionCode = "US";
     NumberType type = NumberType.LOCAL;
 
-    AvailableNumberListAllRequestParameters parameters =
-        AvailableNumberListAllRequestParameters.builder()
-            .setRegionCode(regionCode)
-            .setType(type)
-            .build();
+    AvailableNumberListRequest parameters =
+        AvailableNumberListRequest.builder().setRegionCode(regionCode).setType(type).build();
 
-    AvailableNumberListResponse response = availableNumbersService.list(parameters);
+    AvailableNumberListResponse response = numbersService.searchForAvailableNumbers(parameters);
 
     response
         .iterator()
diff --git a/snippets/numbers/rent/Snippet.java b/snippets/numbers/rent/Snippet.java
index bbb7da5..f0a967c 100644
--- a/snippets/numbers/rent/Snippet.java
+++ b/snippets/numbers/rent/Snippet.java
@@ -1,10 +1,9 @@
 package numbers;
 
-import com.sinch.sdk.domains.numbers.AvailableNumberService;
-import com.sinch.sdk.domains.numbers.NumbersService;
-import com.sinch.sdk.domains.numbers.models.ActiveNumber;
-import com.sinch.sdk.domains.numbers.models.requests.AvailableNumberRentRequestParameters;
-import com.sinch.sdk.domains.numbers.models.requests.RentSMSConfigurationRequestParameters;
+import com.sinch.sdk.domains.numbers.api.v1.NumbersService;
+import com.sinch.sdk.domains.numbers.models.v1.ActiveNumber;
+import com.sinch.sdk.domains.numbers.models.v1.SmsConfiguration;
+import com.sinch.sdk.domains.numbers.models.v1.request.AvailableNumberRentRequest;
 import java.util.logging.Logger;
 
 public class Snippet {
@@ -13,22 +12,18 @@ public class Snippet {
 
   static void execute(NumbersService numbersService) {
 
-    AvailableNumberService availableNumbersService = numbersService.available();
-
     // Available numbers list can be retrieved by using list() function from available service, see:
     // https://developers.sinch.com/quickstart-getting-started-poc/docs/numbers/getting-started/java-sdk/searchavailable
     String phoneNumber = "available_phone_number_to_be_rented";
     String servicePlanId = "YOUR_service_plan_id";
 
-    RentSMSConfigurationRequestParameters smsConfiguration =
-        RentSMSConfigurationRequestParameters.builder().setServicePlanId(servicePlanId).build();
+    SmsConfiguration smsConfiguration =
+        SmsConfiguration.builder().setServicePlanId(servicePlanId).build();
 
-    AvailableNumberRentRequestParameters rentRequest =
-        AvailableNumberRentRequestParameters.builder()
-            .setSmsConfiguration(smsConfiguration)
-            .build();
+    AvailableNumberRentRequest rentRequest =
+        AvailableNumberRentRequest.builder().setSmsConfiguration(smsConfiguration).build();
 
-    ActiveNumber response = availableNumbersService.rent(phoneNumber, rentRequest);
+    ActiveNumber response = numbersService.rent(phoneNumber, rentRequest);
 
     LOGGER.info(String.format("Rented number: %s", response));
   }
diff --git a/snippets/numbers/rent_any/Snippet.java b/snippets/numbers/rent_any/Snippet.java
index a4e28b3..abf1411 100644
--- a/snippets/numbers/rent_any/Snippet.java
+++ b/snippets/numbers/rent_any/Snippet.java
@@ -1,12 +1,11 @@
 package numbers;
 
-import com.sinch.sdk.domains.numbers.AvailableNumberService;
-import com.sinch.sdk.domains.numbers.NumbersService;
-import com.sinch.sdk.domains.numbers.models.ActiveNumber;
-import com.sinch.sdk.domains.numbers.models.Capability;
-import com.sinch.sdk.domains.numbers.models.NumberType;
-import com.sinch.sdk.domains.numbers.models.requests.AvailableNumberRentAnyRequestParameters;
-import com.sinch.sdk.domains.numbers.models.requests.RentSMSConfigurationRequestParameters;
+import com.sinch.sdk.domains.numbers.api.v1.NumbersService;
+import com.sinch.sdk.domains.numbers.models.v1.ActiveNumber;
+import com.sinch.sdk.domains.numbers.models.v1.Capability;
+import com.sinch.sdk.domains.numbers.models.v1.NumberType;
+import com.sinch.sdk.domains.numbers.models.v1.SmsConfiguration;
+import com.sinch.sdk.domains.numbers.models.v1.request.AvailableNumberRentAnyRequest;
 import java.util.Collections;
 import java.util.logging.Logger;
 
@@ -16,8 +15,6 @@ public class Snippet {
 
   static void execute(NumbersService numbersService) {
 
-    AvailableNumberService availableNumbersService = numbersService.available();
-
     String servicePlanId = "YOUR_service_plan_id";
     String regionCode = "YOUR_region_code";
 
@@ -25,15 +22,13 @@ static void execute(NumbersService numbersService) {
     NumberType numberType = NumberType.LOCAL;
 
     ActiveNumber response =
-        availableNumbersService.rentAny(
-            AvailableNumberRentAnyRequestParameters.builder()
+        numbersService.rentAny(
+            AvailableNumberRentAnyRequest.builder()
                 .setCapabilities(Collections.singletonList(capability))
                 .setType(numberType)
                 .setRegionCode(regionCode)
                 .setSmsConfiguration(
-                    RentSMSConfigurationRequestParameters.builder()
-                        .setServicePlanId(servicePlanId)
-                        .build())
+                    SmsConfiguration.builder().setServicePlanId(servicePlanId).build())
                 .build());
 
     LOGGER.info(String.format("Rented number: %s", response));