diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
index 524ceb33..71ea970a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
@@ -37,13 +37,10 @@ public class PickingInventarioViewModel extends ViewModel {
 
     private final InventarioRepository inventarioRepository;
     private final InventarioRowRepository inventarioRowRepository;
-
-    private boolean canAddUnknownItems;
-    private boolean flagShouldAskToCreateOrUpdateRowInventario;
-
     public MutableLiveData<InventarioRoomDTO> currentInventario = new MutableLiveData<>();
     public LiveData<List<InventarioRowRoomDTO>> currentInventarioRows = new MutableLiveData<>();
-
+    private boolean canAddUnknownItems;
+    private boolean flagShouldAskToCreateOrUpdateRowInventario;
     private List<InventarioArtDTO> availableInventarioArts;
     private Listener mListener;
 
@@ -96,7 +93,10 @@ public class PickingInventarioViewModel extends ViewModel {
         var barcodeList = new ArrayList<String>();
         barcodeList.add(itemToUpdate.getScanCodBarre());
 
-        var matchedArt = availableInventarioArts.stream().filter(x -> itemToUpdate.getCodMart() != null && x.getCodMart().contains(itemToUpdate.getCodMart())).findFirst().orElse(null);
+        var matchedArt = availableInventarioArts.stream()
+                .filter(x -> itemToUpdate.getCodMart() != null && x.getCodMart().contains(itemToUpdate.getCodMart()))
+                .findFirst()
+                .orElse(null);
 
         MtbAart articolo;
 
diff --git a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java
index 6caa2924..14de85e6 100644
--- a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java
+++ b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java
@@ -42,6 +42,8 @@ public class ZebraBarcodeReader implements BarcodeReaderInterface {
             return true;
         } else if (model.equalsIgnoreCase("TC20")) {
             return true;
+        } else if (model.equalsIgnoreCase("MBA5")) {
+            return true;
         } else return false;
     }
 
diff --git a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java
index a59ce5df..6e8b5f78 100644
--- a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java
+++ b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java
@@ -17,6 +17,12 @@ public class ZebraBarcodeTypeMapper {
             case "LABEL-TYPE-CODE39":
                 return BarcodeType.CODE39;
 
+
+            case "LABEL-TYPE-IATA2OF5":
+                return BarcodeType.IATA_2OF5;
+            case "LABEL-TYPE-I2OF5":
+                return BarcodeType.INTERLEAVED_2OF5;
+
             case "LABEL-TYPE-EAN13":
                 return BarcodeType.EAN13;
             case "LABEL-TYPE-EAN8":