IVGCVSW-3691 Rework the CounterDirectory class to take into consideration