Final update with the last changes made before transitioning to the VirtualDBScroll Repository