diff --git a/conf/gnss-sdr.conf b/conf/gnss-sdr.conf
index 88a66f3ee..f56a720a6 100644
--- a/conf/gnss-sdr.conf
+++ b/conf/gnss-sdr.conf
@@ -253,8 +253,8 @@ TelemetryDecoder_1C.dump=false
 TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
-Observables.implementation=GPS_L1_CA_Observables
+;#implementation:
+Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
 Observables.dump=false
@@ -264,14 +264,13 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm:
-PVT.implementation=GPS_L1_CA_PVT
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=100
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
+PVT.AR_GPS=PPP-AR ; options: OFF, Continuous, Instantaneous, Fix-and-Hold, PPP-AR
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=10
@@ -279,6 +278,8 @@ PVT.output_rate_ms=10
 ;#display_rate_ms: Position console print (std::out) interval [ms]. Notice that output_rate_ms <= display_rate_ms.
 PVT.display_rate_ms=500
 
+PVT.positioning_mode=PPP_Static
+
 ;# KML, GeoJSON, NMEA and RTCM output configuration
 
 ;#dump_filename: Log path and filename without extension. Notice that PVT will add ".dat" to the binary dump, ".kml" and ".geojson" to GIS-friendly formats.
@@ -304,5 +305,3 @@ PVT.rtcm_dump_devname=/dev/pts/1
 
 ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
 PVT.dump=false
-
-
diff --git a/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf b/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf
index ed7b6dea6..8f3aed872 100644
--- a/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf
@@ -89,7 +89,6 @@ Tracking_1C.order=3;
 ;######### TELEMETRY DECODER GPS CONFIG ############
 TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
 TelemetryDecoder_1C.dump=false
-TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
 Observables.implementation=Hybrid_Observables
@@ -97,9 +96,10 @@ Observables.dump=false.
 Observables.dump_filename=./observables.dat
 
 ;######### PVT CONFIG ############
-PVT.implementation=Hybrid_PVT
-PVT.averaging_depth=100
-PVT.flag_averaging=false
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 PVT.output_rate_ms=10
 PVT.display_rate_ms=500
 PVT.dump_filename=./PVT
@@ -110,4 +110,3 @@ PVT.dump=false
 PVT.flag_rtcm_server=false
 PVT.flag_rtcm_tty_port=false
 PVT.rtcm_dump_devname=/dev/pts/1
-
diff --git a/conf/gnss-sdr_GPS_L1_SPIR.conf b/conf/gnss-sdr_GPS_L1_SPIR.conf
index 7e515dee8..5e4335b00 100644
--- a/conf/gnss-sdr_GPS_L1_SPIR.conf
+++ b/conf/gnss-sdr_GPS_L1_SPIR.conf
@@ -266,7 +266,7 @@ TelemetryDecoder_1C.dump=false
 TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -278,13 +278,10 @@ Observables.dump_filename=./observables.dat
 
 ;######### PVT CONFIG ############
 ;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
-
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=100
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=500
diff --git a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf
index c4963e1dc..b71126374 100644
--- a/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf
@@ -291,7 +291,7 @@ TelemetryDecoder_1C.dump=false
 TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -302,14 +302,12 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100
diff --git a/conf/gnss-sdr_GPS_L1_USRP_realtime.conf b/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
index cd6a6cd7e..22584d4e4 100644
--- a/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_USRP_realtime.conf
@@ -332,7 +332,7 @@ TelemetryDecoder_GPS.dump=false
 TelemetryDecoder_GPS.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -343,14 +343,12 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100
diff --git a/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf b/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf
index 7fc947b46..e4177f18e 100644
--- a/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf
+++ b/conf/gnss-sdr_GPS_L1_acq_QuickSync.conf
@@ -255,7 +255,7 @@ TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
 TelemetryDecoder_1C.dump=false
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -267,13 +267,11 @@ Observables.dump_filename=./observables.dat
 
 ;######### PVT CONFIG ############
 ;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100;
diff --git a/conf/gnss-sdr_GPS_L1_gr_complex.conf b/conf/gnss-sdr_GPS_L1_gr_complex.conf
index 1bb23c1f0..ca5af458c 100644
--- a/conf/gnss-sdr_GPS_L1_gr_complex.conf
+++ b/conf/gnss-sdr_GPS_L1_gr_complex.conf
@@ -64,19 +64,18 @@ Tracking_1C.order=3;
 ;######### TELEMETRY DECODER GPS CONFIG ############
 TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
 TelemetryDecoder_1C.dump=false
-TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
 Observables.implementation=Hybrid_Observables
-Observables.averaging_depth=1
 Observables.dump=false
 Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-PVT.implementation=Hybrid_PVT
-PVT.averaging_depth=100
-PVT.flag_averaging=false
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 PVT.output_rate_ms=1
 PVT.display_rate_ms=100
 PVT.dump_filename=./PVT
@@ -87,4 +86,3 @@ PVT.flag_rtcm_server=false
 PVT.flag_rtcm_tty_port=false
 PVT.rtcm_dump_devname=/dev/pts/1
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf b/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf
index 02f5a0e2d..41e4b61bb 100644
--- a/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf
+++ b/conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf
@@ -57,7 +57,6 @@ Tracking_1C.order=3;
 ;######### TELEMETRY DECODER GPS CONFIG ############
 TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
 TelemetryDecoder_1C.dump=false
-TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
 Observables.implementation=Hybrid_Observables
@@ -66,9 +65,10 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-PVT.implementation=Hybrid_PVT
-PVT.averaging_depth=100
-PVT.flag_averaging=false
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 PVT.output_rate_ms=10
 PVT.display_rate_ms=500
 PVT.dump_filename=./PVT
@@ -79,4 +79,3 @@ PVT.flag_rtcm_server=false
 PVT.flag_rtcm_tty_port=false
 PVT.rtcm_dump_devname=/dev/pts/1
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_GPS_L1_ishort.conf b/conf/gnss-sdr_GPS_L1_ishort.conf
index 1f65e4124..b7376135f 100644
--- a/conf/gnss-sdr_GPS_L1_ishort.conf
+++ b/conf/gnss-sdr_GPS_L1_ishort.conf
@@ -85,10 +85,11 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-PVT.implementation=Hybrid_PVT
-PVT.averaging_depth=100
-PVT.flag_averaging=false
-PVT.output_rate_ms=10
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
+PVT.output_rate_ms=100
 PVT.display_rate_ms=500
 PVT.dump_filename=./PVT
 PVT.nmea_dump_filename=./gnss_sdr_pvt.nmea;
diff --git a/conf/gnss-sdr_GPS_L1_nsr.conf b/conf/gnss-sdr_GPS_L1_nsr.conf
index 79c16f0bd..076f46260 100644
--- a/conf/gnss-sdr_GPS_L1_nsr.conf
+++ b/conf/gnss-sdr_GPS_L1_nsr.conf
@@ -145,11 +145,7 @@ TelemetryDecoder_2S.dump=false
 TelemetryDecoder_2S.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-#Observables.implementation=GPS_L1_CA_Observables
-#Observables.dump=false
-#Observables.dump_filename=./observables.dat
-
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -159,11 +155,11 @@ Observables.dump=false
 Observables.dump_filename=./observables.dat
 
 ;######### PVT CONFIG ############
-#PVT.implementation=Hybrid_PVT
-PVT.implementation=Hybrid_PVT
-PVT.averaging_depth=100
-PVT.flag_averaging=false
-PVT.output_rate_ms=10
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
+PVT.output_rate_ms=100
 PVT.display_rate_ms=500
 PVT.dump_filename=./PVT
 PVT.nmea_dump_filename=./gnss_sdr_pvt.nmea;
@@ -173,4 +169,3 @@ PVT.flag_rtcm_server=false
 PVT.flag_rtcm_tty_port=false
 PVT.rtcm_dump_devname=/dev/pts/1
 PVT.dump=true
-
diff --git a/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf b/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf
index b26266e97..809f2bcbb 100644
--- a/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf
+++ b/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf
@@ -127,18 +127,17 @@ Tracking_1C.order=3;
 ;######### TELEMETRY DECODER GPS CONFIG ############
 TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
 TelemetryDecoder_1C.dump=false
-TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
 Observables.implementation=Hybrid_Observables
 Observables.dump=false
 Observables.dump_filename=./observables.dat
 
-
 ;######### PVT CONFIG ############
-PVT.implementation=Hybrid_PVT
-PVT.averaging_depth=100
-PVT.flag_averaging=false
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 PVT.output_rate_ms=10
 PVT.display_rate_ms=500
 PVT.dump_filename=./PVT
@@ -149,4 +148,3 @@ PVT.flag_rtcm_server=false
 PVT.flag_rtcm_tty_port=false
 PVT.rtcm_dump_devname=/dev/pts/1
 PVT.dump=true
-
diff --git a/conf/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf b/conf/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf
index 8f8fca818..d6222161e 100644
--- a/conf/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf
+++ b/conf/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf
@@ -30,20 +30,20 @@ SignalSource.implementation=File_Signal_Source
 
 ;#When left empty, the device discovery routines will search all vailable transports on the system (ethernet, usb...)
 SignalSource.device_address=192.168.50.2
-    
+
 ;#filename: path to file with the captured GNSS signal samples to be processed
 SignalSource.filename=/home/javier/signals/signal_source_int.dat
 
 ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
 SignalSource.item_type=gr_complex
 
-;#sampling_frequency: Original Signal sampling frequency in [Hz] 
+;#sampling_frequency: Original Signal sampling frequency in [Hz]
 SignalSource.sampling_frequency=2000000
 
-;#freq: RF front-end center frequency in [Hz] 
+;#freq: RF front-end center frequency in [Hz]
 SignalSource.freq=1575420000
 
-;#gain: Front-end Gain in [dB] 
+;#gain: Front-end Gain in [dB]
 SignalSource.gain=40
 
 ;#subdevice: UHD subdevice specification (for USRP1 use A:0 or B:0)
@@ -62,12 +62,12 @@ SignalSource.dump_filename=dump.dat
 
 
 ;#enable_throttle_control: Enabling this option tells the signal source to keep the delay between samples in post processing.
-; it helps to not overload the CPU, but the processing time will be longer. 
+; it helps to not overload the CPU, but the processing time will be longer.
 SignalSource.enable_throttle_control=false
 
 
 ;######### SIGNAL_CONDITIONER CONFIG ############
-;## It holds blocks to change data type, filter and resample input data. 
+;## It holds blocks to change data type, filter and resample input data.
 
 ;#implementation: Use [Pass_Through] or [Signal_Conditioner]
 ;#[Pass_Through] disables this block and the [DataTypeAdapter], [InputFilter] and [Resampler] blocks
@@ -157,19 +157,18 @@ Tracking_1C.order=3;
 ;######### TELEMETRY DECODER GPS CONFIG ############
 TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
 TelemetryDecoder_1C.dump=false
-TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
 Observables.implementation=Hybrid_Observables
-Observables.averaging_depth=1
 Observables.dump=true
 Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-PVT.implementation=Hybrid_PVT
-PVT.averaging_depth=100
-PVT.flag_averaging=false
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 PVT.output_rate_ms=1
 PVT.display_rate_ms=100
 PVT.dump_filename=./PVT
@@ -180,4 +179,3 @@ PVT.flag_rtcm_server=false
 PVT.flag_rtcm_tty_port=false
 PVT.rtcm_dump_devname=/dev/pts/1
 PVT.dump=false
-
diff --git a/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf b/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf
index 34f3546ad..5b1ffe1d6 100644
--- a/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf
@@ -243,7 +243,7 @@ TelemetryDecoder_1C.dump=false
 TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -254,14 +254,11 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
-
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100
diff --git a/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf b/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf
index 3894c1bc3..f7c934703 100644
--- a/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf
+++ b/conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf
@@ -126,14 +126,11 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
-
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 PVT.output_rate_ms=100
 PVT.display_rate_ms=500
 PVT.dump_filename=./PVT
diff --git a/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf b/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf
index ec9cedbd2..b21abf2c7 100644
--- a/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf
+++ b/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf
@@ -119,9 +119,10 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-PVT.implementation=Hybrid_PVT
-PVT.averaging_depth=100
-PVT.flag_averaging=false
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 PVT.output_rate_ms=10
 PVT.display_rate_ms=500
 PVT.dump_filename=./PVT
diff --git a/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf b/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf
index 3b2629bdd..e96fa0e94 100644
--- a/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf
+++ b/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf
@@ -180,18 +180,17 @@ Tracking_2S.early_late_space_chips=0.5;
 ;######### TELEMETRY DECODER GPS CONFIG ############
 TelemetryDecoder_2S.implementation=GPS_L2C_Telemetry_Decoder
 TelemetryDecoder_2S.dump=false
-TelemetryDecoder_2S.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############.
 Observables.implementation=Hybrid_Observables
 Observables.dump=false
 Observables.dump_filename=./observables.dat
 
-
 ;######### PVT CONFIG ############
-PVT.implementation=Hybrid_PVT
-PVT.averaging_depth=10
-PVT.flag_averaging=true
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 PVT.output_rate_ms=100
 PVT.display_rate_ms=500
 PVT.dump_filename=./PVT
diff --git a/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf b/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf
index 838b7d505..4bebf9fcb 100644
--- a/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf
+++ b/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf
@@ -136,18 +136,17 @@ Tracking_2S.early_late_space_chips=0.5;
 ;######### TELEMETRY DECODER GPS CONFIG ############
 TelemetryDecoder_2S.implementation=GPS_L2C_Telemetry_Decoder
 TelemetryDecoder_2S.dump=true
-TelemetryDecoder_2S.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############.
 Observables.implementation=Hybrid_Observables
 Observables.dump=false
 Observables.dump_filename=./observables.dat
 
-
 ;######### PVT CONFIG ############
-PVT.implementation=Hybrid_PVT
-PVT.averaging_depth=10
-PVT.flag_averaging=true
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 PVT.output_rate_ms=100
 PVT.display_rate_ms=500
 PVT.dump_filename=./PVT
diff --git a/conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf b/conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf
index 19daeb723..a305cd277 100644
--- a/conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf
+++ b/conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf
@@ -67,9 +67,10 @@ Observables.dump=false
 Observables.dump_filename=./observables.dat
 
 ;######### PVT CONFIG ############
-PVT.implementation=Hybrid_PVT
-PVT.averaging_depth=100
-PVT.flag_averaging=false
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 PVT.output_rate_ms=100;
 PVT.display_rate_ms=500;
 PVT.dump=false
diff --git a/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf b/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf
index ebe0d1ba7..9be99d94d 100644
--- a/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf
+++ b/conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf
@@ -248,13 +248,10 @@ Observables.dump_filename=./observables.dat
 
 ;######### PVT CONFIG ############
 ;#implementation: Position Velocity and Time (PVT) implementation algorithm:
-PVT.implementation=Hybrid_PVT
-
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=100
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100;
diff --git a/conf/gnss-sdr_Galileo_E1_ishort.conf b/conf/gnss-sdr_Galileo_E1_ishort.conf
index 27ce0a1f1..cada1263c 100644
--- a/conf/gnss-sdr_Galileo_E1_ishort.conf
+++ b/conf/gnss-sdr_Galileo_E1_ishort.conf
@@ -239,7 +239,7 @@ TelemetryDecoder_1B.implementation=Galileo_E1B_Telemetry_Decoder
 TelemetryDecoder_1B.dump=false
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -250,14 +250,11 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
-
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=100
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=false
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100;
diff --git a/conf/gnss-sdr_Galileo_E1_nsr.conf b/conf/gnss-sdr_Galileo_E1_nsr.conf
index cc8fa2e6d..c357bd013 100644
--- a/conf/gnss-sdr_Galileo_E1_nsr.conf
+++ b/conf/gnss-sdr_Galileo_E1_nsr.conf
@@ -112,9 +112,10 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-PVT.implementation=Hybrid_PVT
-PVT.averaging_depth=1
-PVT.flag_averaging=false
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 PVT.output_rate_ms=100
 PVT.display_rate_ms=500
 PVT.dump=true
diff --git a/conf/gnss-sdr_Galileo_E5a.conf b/conf/gnss-sdr_Galileo_E5a.conf
index bd87765a6..1528a5d2b 100644
--- a/conf/gnss-sdr_Galileo_E5a.conf
+++ b/conf/gnss-sdr_Galileo_E5a.conf
@@ -297,13 +297,11 @@ Observables.dump_filename=./observables.dat
 
 ;######### PVT CONFIG ############
 ;#implementation: Position Velocity and Time (PVT) implementation algorithm:
-PVT.implementation=Hybrid_PVT
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=100
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+PVT.positioning_mode=Single  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time [ms]
 PVT.output_rate_ms=100
diff --git a/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf b/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf
index bacd7320a..6b733b4dd 100644
--- a/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf
+++ b/conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf
@@ -140,9 +140,10 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-PVT.implementation=Hybrid_PVT
-PVT.averaging_depth=100
-PVT.flag_averaging=true
+PVT.implementation=RTKLIB_PVT
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=OFF ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=OFF ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 PVT.output_rate_ms=100
 PVT.dump=false
 PVT.dump_filename=./PVT
@@ -152,4 +153,3 @@ PVT.nmea_dump_devname=/dev/pts/4
 PVT.flag_rtcm_server=true
 PVT.flag_rtcm_tty_port=false
 PVT.rtcm_dump_devname=/dev/pts/1
-
diff --git a/conf/gnss-sdr_Hybrid_byte.conf b/conf/gnss-sdr_Hybrid_byte.conf
index d4b2a6a16..047c2bc6f 100644
--- a/conf/gnss-sdr_Hybrid_byte.conf
+++ b/conf/gnss-sdr_Hybrid_byte.conf
@@ -295,10 +295,9 @@ TelemetryDecoder_1C.decimation_factor=4;
 ;#implementation: Use [Galileo_E1B_Telemetry_Decoder] for Galileo E1B
 TelemetryDecoder_1B.implementation=Galileo_E1B_Telemetry_Decoder
 TelemetryDecoder_1B.dump=false
-TelemetryDecoder_1B.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -309,14 +308,12 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=false
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100;
diff --git a/conf/gnss-sdr_Hybrid_byte_sim.conf b/conf/gnss-sdr_Hybrid_byte_sim.conf
index 40120b2c3..32bea4e58 100644
--- a/conf/gnss-sdr_Hybrid_byte_sim.conf
+++ b/conf/gnss-sdr_Hybrid_byte_sim.conf
@@ -292,7 +292,7 @@ TelemetryDecoder_1B.dump=false
 TelemetryDecoder_1B.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -306,11 +306,9 @@ Observables.dump_filename=./observables.dat
 ;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
 PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=false
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100;
diff --git a/conf/gnss-sdr_Hybrid_gr_complex.conf b/conf/gnss-sdr_Hybrid_gr_complex.conf
index a0f10bdb4..e444a9326 100644
--- a/conf/gnss-sdr_Hybrid_gr_complex.conf
+++ b/conf/gnss-sdr_Hybrid_gr_complex.conf
@@ -304,10 +304,9 @@ TelemetryDecoder_1C.decimation_factor=4;
 ;#implementation: Use [Galileo_E1B_Telemetry_Decoder] for Galileo E1B
 TelemetryDecoder_1B.implementation=Galileo_E1B_Telemetry_Decoder
 TelemetryDecoder_1B.dump=false
-TelemetryDecoder_1B_factor=4;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -318,14 +317,12 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=false
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=10;
diff --git a/conf/gnss-sdr_Hybrid_ishort.conf b/conf/gnss-sdr_Hybrid_ishort.conf
index e326d475f..b6cbe8591 100644
--- a/conf/gnss-sdr_Hybrid_ishort.conf
+++ b/conf/gnss-sdr_Hybrid_ishort.conf
@@ -311,7 +311,7 @@ TelemetryDecoder_1B.dump=false
 TelemetryDecoder_1B.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -322,14 +322,12 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=false
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100;
diff --git a/conf/gnss-sdr_Hybrid_nsr.conf b/conf/gnss-sdr_Hybrid_nsr.conf
index 3ef5a0104..51ca610e5 100644
--- a/conf/gnss-sdr_Hybrid_nsr.conf
+++ b/conf/gnss-sdr_Hybrid_nsr.conf
@@ -304,7 +304,7 @@ TelemetryDecoder_1B.dump=false
 TelemetryDecoder_1B_factor=4;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -315,14 +315,13 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+;#implementation: Position Velocity and Time (PVT) implementation algorithm.
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=false
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=10;
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf
index 41aa85d3c..924d72f9e 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf
@@ -289,11 +289,9 @@ Tracking_1C.early_late_space_chips=0.5;
 ;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A
 TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
 TelemetryDecoder_1C.dump=false
-;#decimation factor
-TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -304,14 +302,12 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf
index 73de71e58..b6de1c3cd 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf
@@ -300,7 +300,7 @@ TelemetryDecoder_1C.dump=false
 TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -311,14 +311,12 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf
index 3a44b0e0b..2e33999f6 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf
@@ -294,11 +294,9 @@ Tracking_1C.early_late_space_chips=0.5;
 ;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A
 TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
 TelemetryDecoder_1C.dump=false
-;#decimation factor
-TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -309,14 +307,12 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf
index 3c074a9b1..b49d1c795 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf
@@ -299,7 +299,7 @@ TelemetryDecoder_1C.dump=false
 TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -310,14 +310,12 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf
index a86966d0c..8cf620713 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf
@@ -294,7 +294,7 @@ TelemetryDecoder_1C.dump=false
 TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -306,13 +306,11 @@ Observables.dump_filename=./observables.dat
 
 ;######### PVT CONFIG ############
 ;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf
index 3f54ad14d..2f2ba159d 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf
@@ -444,7 +444,7 @@ TelemetryDecoder_2S.decimation_factor=1;
 
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.Mixed_Observables
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -455,8 +455,12 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
+
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#averaging_depth: Number of PVT observations in the moving average algorithm
 PVT.averaging_depth=10
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf
index 6932bd009..436b1070f 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf
@@ -452,7 +452,7 @@ TelemetryDecoder_1B.decimation_factor=5;
 
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -464,13 +464,11 @@ Observables.dump_filename=./observables.dat
 
 ;######### PVT CONFIG ############
 ;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=false
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100
diff --git a/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf b/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf
index 828976e07..62938acd4 100644
--- a/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L1_USRP_X300_realtime.conf
@@ -364,11 +364,9 @@ Tracking_1C.early_late_space_chips=0.5;
 ;#implementation: Use [GPS_L1_CA_Telemetry_Decoder] for GPS L1 C/A
 TelemetryDecoder_1C.implementation=GPS_L1_CA_Telemetry_Decoder
 TelemetryDecoder_1C.dump=false
-;#decimation factor
-TelemetryDecoder_1C.decimation_factor=1;
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -379,14 +377,12 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=true
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100
diff --git a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf
index bf358ffd3..40913cc7f 100644
--- a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf
@@ -371,25 +371,21 @@ TelemetryDecoder_2S.decimation_factor=1;
 
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
-Observables.averaging_depth = 100
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
 Observables.dump=false
-
 ;#dump_filename: Log path and filename.
 Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=5
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=false
+PVT.positioning_mode=PPP_Static  ; options: Single, Static, Kinematic, PPP_Static, PPP_Kinematic
+PVT.iono_model=Broadcast ; options: OFF, Broadcast, SBAS, Iono-Free-LC, Estimate_STEC, IONEX
+PVT.trop_model=Saastamoinen ; options: OFF, Saastamoinen, SBAS, Estimate_ZTD, Estimate_ZTD_Grad
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100
diff --git a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf
index e82c95619..26128cf81 100644
--- a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf
+++ b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf
@@ -370,9 +370,8 @@ TelemetryDecoder_2S.decimation_factor=1;
 
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
-Observables.averaging_depth = 5
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
 Observables.dump=true
 
@@ -381,17 +380,11 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
-
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=5
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=false
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
-PVT.output_rate_ms=1
+PVT.output_rate_ms=100
 
 ;#display_rate_ms: Position console print (std::out) interval [ms]. Notice that output_rate_ms<=display_rate_ms.
 PVT.display_rate_ms=100
diff --git a/conf/gnss-sdr_multisource_Hybrid_ishort.conf b/conf/gnss-sdr_multisource_Hybrid_ishort.conf
index 00d85930f..31f777693 100644
--- a/conf/gnss-sdr_multisource_Hybrid_ishort.conf
+++ b/conf/gnss-sdr_multisource_Hybrid_ishort.conf
@@ -420,7 +420,7 @@ TelemetryDecoder_Galileo.dump=false
 
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -431,14 +431,8 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
-
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=false
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=100;
diff --git a/conf/gnss-sdr_multisource_Hybrid_nsr.conf b/conf/gnss-sdr_multisource_Hybrid_nsr.conf
index 5ced6c5a5..f0a644f18 100644
--- a/conf/gnss-sdr_multisource_Hybrid_nsr.conf
+++ b/conf/gnss-sdr_multisource_Hybrid_nsr.conf
@@ -446,7 +446,7 @@ TelemetryDecoder_1B.decimation_factor=4;
 
 
 ;######### OBSERVABLES CONFIG ############
-;#implementation: Use [GPS_L1_CA_Observables] for GPS L1 C/A.
+;#implementation:
 Observables.implementation=Hybrid_Observables
 
 ;#dump: Enable or disable the Observables internal binary data file logging [true] or [false]
@@ -457,14 +457,8 @@ Observables.dump_filename=./observables.dat
 
 
 ;######### PVT CONFIG ############
-;#implementation: Position Velocity and Time (PVT) implementation algorithm: Use [GPS_L1_CA_PVT] in this version.
-PVT.implementation=Hybrid_PVT
-
-;#averaging_depth: Number of PVT observations in the moving average algorithm
-PVT.averaging_depth=10
-
-;#flag_average: Enables the PVT averaging between output intervals (arithmetic mean) [true] or [false]
-PVT.flag_averaging=false
+;#implementation: Position Velocity and Time (PVT) implementation:
+PVT.implementation=RTKLIB_PVT
 
 ;#output_rate_ms: Period between two PVT outputs. Notice that the minimum period is equal to the tracking integration time (for GPS CA L1 is 1ms) [ms]
 PVT.output_rate_ms=10;