diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
index ef16360b8..ebd2178bf 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
@@ -2006,7 +2006,7 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item
         {
             std::vector<gr::tag_t> tags_vec;
             // time tag from obs to pvt is always propagated in channel 0
-            this->get_tags_in_range(tags_vec, 0, this->nitems_read(0), this->nitems_read(0) + noutput_items);
+            this->get_tags_in_range(tags_vec, 0, this->nitems_read(0), this->nitems_read(0) + noutput_items, pmt::mp("timetag"));
             for (const auto& it : tags_vec)
                 {
                     try
diff --git a/src/algorithms/libs/sensor_data/sensor_data_aggregator.cc b/src/algorithms/libs/sensor_data/sensor_data_aggregator.cc
index 49454128b..22e4c02c7 100644
--- a/src/algorithms/libs/sensor_data/sensor_data_aggregator.cc
+++ b/src/algorithms/libs/sensor_data/sensor_data_aggregator.cc
@@ -1,6 +1,6 @@
 /*!
- * \file sensor_data_file.cc
- * \brief  Provides a simple abstraction for reading contiguous binary data from a file
+ * \file sensor_data_aggregator.cc
+ * \brief  Aggregates sensor samples from gnu radio stream tags into typed lists for easy access
  * \author Victor Castillo, 2024. victorcastilloaguero(at).gmail.es
  *
  * -----------------------------------------------------------------------------
diff --git a/src/algorithms/libs/sensor_data/sensor_data_aggregator.h b/src/algorithms/libs/sensor_data/sensor_data_aggregator.h
index 9c5033a02..2a2c7d480 100644
--- a/src/algorithms/libs/sensor_data/sensor_data_aggregator.h
+++ b/src/algorithms/libs/sensor_data/sensor_data_aggregator.h
@@ -1,6 +1,6 @@
 /*!
  * \file sensor_data_aggregator.h
- * \brief  GNURadio block that adds extra data to the sample stream.
+ * \brief  Aggregates sensor samples from gnu radio stream tags into typed lists for easy access
  * \author Victor Castillo, 2024. victorcastilloaguero(at).gmail.es
  *
  * -----------------------------------------------------------------------------
@@ -24,9 +24,9 @@
 #include <string>
 #include <vector>
 
-/** \addtogroup Signal_Source
+/** \addtogroup Algorithms_Library
  * \{ */
-/** \addtogroup Signal_Source_libs
+/** \addtogroup Algorithm_libs algorithms_libs
  * \{ */
 
 template <typename DataType>
diff --git a/src/algorithms/libs/sensor_data/sensor_data_file.cc b/src/algorithms/libs/sensor_data/sensor_data_file.cc
index 6e1ca21ee..f10a0b53a 100644
--- a/src/algorithms/libs/sensor_data/sensor_data_file.cc
+++ b/src/algorithms/libs/sensor_data/sensor_data_file.cc
@@ -17,6 +17,9 @@
 #include "sensor_data_file.h"
 #include <cstring>
 
+
+static const std::size_t IO_BUFFER_MAX_SIZE = 1024;
+
 SensorDataFile::SensorDataFile(
     const std::string& path,
     const std::size_t& sample_delay,
@@ -34,7 +37,7 @@ SensorDataFile::SensorDataFile(
       done_(false),
       chunks_read_(0),
       last_sample_stamp_(sample_delay),
-      io_buffer_size_(item_size * IO_BUFFER_CAPACITY),
+      io_buffer_size_(item_size * IO_BUFFER_MAX_SIZE),
       offset_in_io_buffer_(io_buffer_size_)  // Set to end of buffer so that first look up will trigger a read.
 {
     file_.seekg(offset_in_file_, std::ios_base::beg);
diff --git a/src/algorithms/libs/sensor_data/sensor_data_file.h b/src/algorithms/libs/sensor_data/sensor_data_file.h
index d71d66f83..e09f090b4 100644
--- a/src/algorithms/libs/sensor_data/sensor_data_file.h
+++ b/src/algorithms/libs/sensor_data/sensor_data_file.h
@@ -25,16 +25,14 @@
 #include <string>
 #include <vector>
 
-/** \addtogroup Signal_Source
+/** \addtogroup Algorithms_Library
  * \{ */
-/** \addtogroup Signal_Source_libs
+/** \addtogroup Algorithm_libs algorithms_libs
  * \{ */
 
 
 class SensorDataFile
 {
-    static constexpr std::size_t IO_BUFFER_CAPACITY = 1024;
-
 public:
     using sptr = std::shared_ptr<SensorDataFile>;
     using id_type = std::size_t;
@@ -60,7 +58,6 @@ private:
 
     void read_into_item_buffer(std::vector<uint8_t>& item_buf);
 
-private:
     std::string path_;
     std::ifstream file_;
     std::size_t sample_delay_;
diff --git a/src/algorithms/libs/sensor_data/sensor_data_source.h b/src/algorithms/libs/sensor_data/sensor_data_source.h
index a99433588..f681ab65e 100644
--- a/src/algorithms/libs/sensor_data/sensor_data_source.h
+++ b/src/algorithms/libs/sensor_data/sensor_data_source.h
@@ -25,11 +25,10 @@
 #include <gnuradio/types.h>       // for gr_vector_const_void_star
 #include <cstddef>                // for size_t
 #include <cstdint>
-#include <string>
 
-/** \addtogroup Signal_Source
+/** \addtogroup Algorithms_Library
  * \{ */
-/** \addtogroup Signal_Source_gnuradio_blocks
+/** \addtogroup Algorithm_libs algorithms_libs
  * \{ */
 
 class SensorDataSource : public gr::sync_block
diff --git a/src/algorithms/libs/sensor_data/sensor_data_source_configuration.h b/src/algorithms/libs/sensor_data/sensor_data_source_configuration.h
index 822089d11..e2ebe9985 100644
--- a/src/algorithms/libs/sensor_data/sensor_data_source_configuration.h
+++ b/src/algorithms/libs/sensor_data/sensor_data_source_configuration.h
@@ -1,6 +1,6 @@
 /*!
  * \file sensor_data_source_configuration.h
- * \brief  GNURadio block that adds extra data to the sample stream.
+ * \brief
  * \author Victor Castillo, 2024. victorcastilloaguero(at).gmail.es
  *
  * -----------------------------------------------------------------------------
@@ -24,9 +24,9 @@
 #include <string>
 #include <unordered_map>
 
-/** \addtogroup Signal_Source
+/** \addtogroup Algorithms_Library
  * \{ */
-/** \addtogroup Signal_Source_gnuradio_blocks
+/** \addtogroup Algorithm_libs algorithms_libs
  * \{ */
 
 using namespace std::string_literals;
diff --git a/src/algorithms/libs/sensor_data/sensor_data_type.cc b/src/algorithms/libs/sensor_data/sensor_data_type.cc
index 61060a7ac..cb503f53f 100644
--- a/src/algorithms/libs/sensor_data/sensor_data_type.cc
+++ b/src/algorithms/libs/sensor_data/sensor_data_type.cc
@@ -16,7 +16,6 @@
 
 #include "sensor_data_type.h"
 #include <pmt/pmt.h>
-#include <cstdint>
 #include <stdexcept>
 #include <string>
 
diff --git a/src/algorithms/libs/sensor_data/sensor_data_type.h b/src/algorithms/libs/sensor_data/sensor_data_type.h
index 77ca25ac3..e6577ad8e 100644
--- a/src/algorithms/libs/sensor_data/sensor_data_type.h
+++ b/src/algorithms/libs/sensor_data/sensor_data_type.h
@@ -18,13 +18,12 @@
 #ifndef GNSS_SDR_SENSOR_DATA_TYPE_H
 #define GNSS_SDR_SENSOR_DATA_TYPE_H
 
-#include <cstdint>
 #include <pmt/pmt.h>
 #include <string>
 
-/** \addtogroup Signal_Source
+/** \addtogroup Algorithms_Library
  * \{ */
-/** \addtogroup Signal_Source_libs
+/** \addtogroup Algorithm_libs algorithms_libs
  * \{ */
 
 struct SensorDataType
diff --git a/src/algorithms/libs/sensor_data/sensor_identifier.cc b/src/algorithms/libs/sensor_data/sensor_identifier.cc
index 607d5dc11..abc1a8ecb 100644
--- a/src/algorithms/libs/sensor_data/sensor_identifier.cc
+++ b/src/algorithms/libs/sensor_data/sensor_identifier.cc
@@ -16,7 +16,6 @@
 
 #include "sensor_identifier.h"
 #include "sensor_data_type.h"
-#include <iostream>
 #include <stdexcept>
 #include <string>
 
diff --git a/src/algorithms/libs/sensor_data/sensor_identifier.h b/src/algorithms/libs/sensor_data/sensor_identifier.h
index 206df7b83..d428121ed 100644
--- a/src/algorithms/libs/sensor_data/sensor_identifier.h
+++ b/src/algorithms/libs/sensor_data/sensor_identifier.h
@@ -21,9 +21,9 @@
 #include "sensor_data_type.h"
 #include <string>
 
-/** \addtogroup Signal_Source
+/** \addtogroup Algorithms_Library
  * \{ */
-/** \addtogroup Signal_Source_libs
+/** \addtogroup Algorithm_libs algorithms_libs
  * \{ */
 
 struct SensorIdentifier