diff --git a/+adi/+QuadMxFE/Base.m b/+adi/+QuadMxFE/Base.m
index 0da53f10..a5455f97 100644
--- a/+adi/+QuadMxFE/Base.m
+++ b/+adi/+QuadMxFE/Base.m
@@ -23,6 +23,10 @@
         SamplingRate = 250e6;
     end
     
+    properties (Logical)
+       CalibrationBoardAttached = false; 
+    end
+    
     properties(Nontunable, Hidden)
         Timeout = Inf;
         kernelBuffersCount = 2;
@@ -38,6 +42,11 @@
         ComplexData = true;
     end
     
+    properties (Hidden)
+       iioAD5592r;
+       iioOneBitADCDAC;
+    end
+    
     methods
         %% Constructor
         function obj = Base(varargin)
diff --git a/+adi/+QuadMxFE/Rx.m b/+adi/+QuadMxFE/Rx.m
index a0d63288..6df7075a 100644
--- a/+adi/+QuadMxFE/Rx.m
+++ b/+adi/+QuadMxFE/Rx.m
@@ -340,7 +340,7 @@
             obj.ExternalAttenuation = value;
             if obj.ConnectedToDevice
                 id = 'voltage0';
-                obj.setAttributeLongLong(id,'hardwaregain',value,true,obj.iioHMC425a);
+                obj.setAttributeLongLong(id,'hardwaregain',value,true,0,obj.iioHMC425a);
             end
         end
     end
@@ -368,6 +368,10 @@ function setupInit(obj)
             obj.iioDev1 = getDev(obj, obj.devName1);
             obj.iioDev2 = getDev(obj, obj.devName2);
             obj.iioHMC425a = getDev(obj, 'hmc425a');
+            if obj.CalibrationBoardAttached
+                obj.iioAD5592r = getDev(obj, 'ad5592r');
+                obj.iioOneBitADCDAC = getDev(obj, 'one-bit-adc-dac');
+            end
             
             % Update attributes
             obj.setAttributeRAW('voltage0_i','test_mode',...
diff --git a/+adi/+QuadMxFE/Tx.m b/+adi/+QuadMxFE/Tx.m
index f7b6e2a5..f0de9cbb 100644
--- a/+adi/+QuadMxFE/Tx.m
+++ b/+adi/+QuadMxFE/Tx.m
@@ -422,6 +422,10 @@ function setupInit(obj)
             obj.iioDevADF4371_2 = getDev(obj, 'adf4371-2');
             obj.iioDevADF4371_3 = getDev(obj, 'adf4371-3');
             obj.iioDevHMC7043 = getDev(obj, 'hmc7043');
+            if obj.CalibrationBoardAttached
+                obj.iioAD5592r = getDev(obj, 'ad5592r');
+                obj.iioOneBitADCDAC = getDev(obj, 'one-bit-adc-dac');
+            end
 
             %%
             obj.CheckAndUpdateHW(obj.ChannelNCOFrequenciesChipA,...
diff --git a/+adi/+common b/+adi/+common
index 938b49d8..62420f9e 160000
--- a/+adi/+common
+++ b/+adi/+common
@@ -1 +1 @@
-Subproject commit 938b49d8b2bb6e144c4aaa9b52a4f2ac571606e2
+Subproject commit 62420f9e37bdfe9109941783c9f2be65aec16858